Commenting out assertions that fail in 1.521+ due to improved core be…

…havior from JENKINS-18407.
jenkinsci · Jun 7, 2014 · 4fe33a1 · 4fe33a1
1 parent af6eaf1
commit 4fe33a1
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/test/java/hudson/plugins/git/RevisionParameterActionTest.java b/src/test/java/hudson/plugins/git/RevisionParameterActionTest.java
@@ -29,14 +29,8 @@
 import hudson.model.Result;
 import hudson.plugins.git.util.BuildData;
 
-import org.eclipse.jgit.lib.ObjectId;
-import org.jvnet.hudson.test.HudsonTestCase;
-
 import java.util.concurrent.Future;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * Tests for {@link RevisionParameterAction}
@@ -77,7 +71,9 @@ public void testCombiningScheduling2() throws Exception {
 
         // Check that we have the correct futures.
         assertNotNull(b1);
-        assertNull(b2); // TODO fails in 1.521+ (along with other assertNull calls), perhaps due to fix of JENKINS-18407
+        /* As of 1.521 this is non-null, although the future yields the same build as b1:
+        assertNull(b2);
+        */
 
         // Check that only one build occurred
         waitUntilNoActivity();
@@ -114,7 +110,7 @@ public void testCombiningScheduling4() throws Exception {
 
         // Check that we have the correct futures.
         assertNotNull(b1);
-        assertNull(b2);
+        //assertNull(b2);
 
         // Check that only one build occurred
         waitUntilNoActivity();
@@ -137,7 +133,7 @@ public void testCombiningScheduling5() throws Exception {
 
         // Check that we have the correct futures.
         assertNotNull(b1);
-        assertNull(b2);
+        //assertNull(b2);
 
         // Check that only one build occurred
         waitUntilNoActivity();