[JENKINS-26137] At least during restarting tests, serialization error…

…s seem to be due to there being no PickleFactory’s installed. Merely calling PickleFactory.all() from the RiverWriter constructor, rather than later, seems to let PushdStepTest.restarting pass (JENKINS-26051). Additionally asserting that there are in fact some factories loaded, since there is sure to be trouble if there are not. Also need to wait for the build to finish (JENKINS-26399). Originally-Committed-As: 3d3fa348ed9c34e4492b2733802bc47416824e30
jenkinsci · Jan 12, 2015 · 7583bf1 · 7583bf1
1 parent 0aec9ed
commit 7583bf1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java
@@ -28,7 +28,6 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.Rule;
 import org.junit.runners.model.Statement;
@@ -48,7 +47,6 @@ public class PushdStepTest {
         });
     }
 
-    @Ignore("TODO as per JENKINS-26149 PushdStep.Execution.step might need to be optional=true, but cannot get this test to pass because of JENKINS-26137")
     @Test public void restarting() {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
@@ -62,6 +60,9 @@ public class PushdStepTest {
             @Override public void evaluate() throws Throwable {
                 SemaphoreStep.success("restarting/1", null);
                 WorkflowRun b = story.j.jenkins.getItemByFullName("p", WorkflowJob.class).getLastBuild();
+                while (b.isBuilding()) { // TODO JENKINS-26399
+                    Thread.sleep(100);
+                }
                 story.j.assertLogContains("/subdir", story.j.assertBuildStatusSuccess(b));
             }
         });