Wait for builds to finish in new tests

Author: dwnusbaum

src/test/java/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest.java

@@ -24,6 +24,7 @@
 
 package org.jenkinsci.plugins.workflow.support.storage;
 
+import hudson.model.Result;
 import hudson.util.RobustReflectionConverter;
 import java.io.File;
 import java.util.ArrayList;
@@ -84,6 +85,9 @@ public final class BulkFlowNodeStorageTest {
         */
         var p = r.jenkins.getItemByFullName("test0", WorkflowJob.class);
         var b = p.getLastBuild();
+        // Build is unresumable because the local data was created with PERFORMANCE_OPTIMIZED without a clean shutdown.
+        r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
+        // Existing flow nodes should still be preserved though.
         var stageBodyStartNode = (StepStartNode) b.getExecution().getNode("4");
         assertThat(stageBodyStartNode, not(nullValue()));
         var label = stageBodyStartNode.getPersistentAction(LabelAction.class);

src/test/java/org/jenkinsci/plugins/workflow/support/storage/SimpleXStreamStorageTest.java

@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.workflow.support.storage;
 
 
+import hudson.model.Result;
 import hudson.util.RobustReflectionConverter;
 import java.io.File;
 import java.util.logging.Level;
@@ -10,6 +11,7 @@
 import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode;
 import org.jenkinsci.plugins.workflow.graph.AtomNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -100,6 +102,8 @@ public void testDeferWriteAndFlush() throws Exception {
         */
         var p = j.jenkins.getItemByFullName("test0", WorkflowJob.class);
         var b = p.getLastBuild();
+        SemaphoreStep.success("wait/1", null);
+        j.assertBuildStatus(Result.SUCCESS, j.waitForCompletion(b));
         var stageBodyStartNode = (StepStartNode) b.getExecution().getNode("4");
         assertThat(stageBodyStartNode, not(nullValue()));
         var label = stageBodyStartNode.getPersistentAction(LabelAction.class);

src/test/java/org/jenkinsci/plugins/workflow/test/steps/SemaphoreStep.java

@@ -234,6 +234,22 @@ public static class Execution extends AbstractStepExecutionImpl {
             }
         }
 
+        @Override public void onResume() {
+            // Only matters for restarts across different JVMs, for example if using @LocalData.
+            State s = State.get();
+            String c = Jenkins.XSTREAM.toXML(getContext());
+            synchronized (s) {
+                if (s.returnValues.containsKey(k)) {
+                    getContext().onSuccess(s.returnValues.get(k));
+                } else if (s.errors.containsKey(k)) {
+                    getContext().onFailure(s.errors.get(k));
+                } else {
+                    s.contexts.put(k, c);
+                }
+                s.notifyAll();
+            }
+        }
+
         private static final long serialVersionUID = 1L;
 
     }