Hoping a more standard use of SemaphoreStep may avoid some unidentified race condition #515 (comment)

Author: jglick

src/test/java/com/cloudbees/jenkins/support/impl/NodeExecutorsTest.java

@@ -21,8 +21,10 @@
 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.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.JenkinsRule;
 
 /**
@@ -33,6 +35,9 @@ public class NodeExecutorsTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @ClassRule
+    public static BuildWatcher bw = new BuildWatcher();
+
     @Test
     public void addContents() throws Exception {
         DumbSlave agent = j.createOnlineSlave(Label.parseExpression("test"), null);
@@ -91,7 +96,7 @@ public void addContentsRunningBuild() throws Exception {
         WorkflowRun workflowRun = Optional.ofNullable(p.scheduleBuild2(0))
                 .orElseThrow(AssertionFailedError::new)
                 .waitForStart();
-        j.waitForMessage("Running on", workflowRun);
+        SemaphoreStep.waitForStart("wait/1", workflowRun);
 
         String executorMd = SupportTestUtils.invokeComponentToMap(new NodeExecutors(), agent.toComputer())
                 .get("executors.md");