Merge pull request #945 from jglick/iterateAfterSuspend

`CpsFlowExecutionTest.iterateAfterSuspend` flaky

Author: jglick

plugin/pom.xml

@@ -240,6 +240,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -1676,7 +1676,7 @@ public static void suspendAll() {
                         if (cpsExec.programPromise != null) {
                             cpsExec.runInCpsVmThread(new FutureCallback<>() {
                                 @Override public void onSuccess(CpsThreadGroup g) {
-                                    LOGGER.fine(() -> "shutting down CPS VM threadin for " + cpsExec);
+                                    LOGGER.fine(() -> "shutting down CPS VM for " + cpsExec);
                                     g.shutdown();
                                 }
                                 @Override public void onFailure(Throwable t) {

plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java

@@ -73,6 +73,7 @@
 import java.util.stream.Collectors;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.FileUtils;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.contains;
@@ -207,6 +208,7 @@ private static List<String> stepNames(ListenableFuture<List<StepExecution>> exec
 
     @Test public void iterateAfterSuspend() throws Throwable {
         sessions.then(r -> {
+            logger.record(CpsFlowExecution.class, Level.FINE);
             WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "iterateAfterSuspend");
             p.setDefinition(new CpsFlowDefinition("semaphore 'wait'", true));
             SemaphoreStep.waitForStart("wait/1", p.scheduleBuild2(0).waitForStart());
@@ -226,7 +228,7 @@ private static List<String> stepNames(ListenableFuture<List<StepExecution>> exec
             return; // different test
         }
         try {
-            assertThat(p.getLastBuild().getExecution().getCurrentExecutions(false).get(), empty());
+            await().until(() -> p.getLastBuild().getExecution().getCurrentExecutions(false).get(), empty());
         } catch (Throwable t) {
             iterateAfterSuspendError.set(t);
         }