Merge pull request #208 from Vlatombe/flaky-InputStepRestartTest-interrupt

Better test result whenever InputStepRestartTest#interrupt fails

Author: jglick

pom.xml

@@ -52,6 +52,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>4.3.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -116,5 +121,10 @@
             <artifactId>credentials-binding</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/test/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepRestartTest.java

@@ -36,11 +36,13 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.jenkinsci.plugins.workflow.support.actions.PauseAction;
+
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.*;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runners.model.Statement;
 import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -97,11 +99,7 @@ private void sanity(WorkflowRun b) throws Exception {
                 WorkflowRun b = j.jenkins.getItemByFullName("p", WorkflowJob.class).getBuildByNumber(1);
                 assertNotNull(b);
                 assertTrue(b.isBuilding());
-                Executor executor;
-                while ((executor = b.getExecutor()) == null) {
-                    Thread.sleep(100); // probably a race condition: AfterRestartTask could take a moment to be registered
-                }
-                assertNotNull(executor);
+                Executor executor = await().until(b::getExecutor, notNullValue());
                 executor.interrupt();
                 j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(b));
                 sanity(b);