[JENKINS-25975] Seem to have fixed a race condition whereby quick `sh…

…` steps would sometimes not print all of their output.
jenkinsci · May 29, 2015 · 27e5b23 · 27e5b23
1 parent cbf9014
commit 27e5b23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
@@ -364,7 +364,7 @@ private void startJnlpProc() throws Exception {
                     Thread.sleep(100);
                 }
                 story.j.assertBuildStatusSuccess(JenkinsRuleExt.waitForCompletion(b));
-                story.j.assertLogContains("finished waiting", b); // TODO sometimes missing
+                story.j.assertLogContains("finished waiting", b);
                 story.j.assertLogContains("OK, done", b);
                 killJnlpProc();
             }

diff --git a/...step/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java b/...step/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java
@@ -193,6 +193,9 @@ private void check() {
                     LOGGER.log(Level.FINE, "still running in {0} on {1}", new Object[] {remote, node});
                 } else {
                     recurrencePeriod = 0;
+                    if (controller.writeLog(workspace, listener.getLogger())) {
+                        LOGGER.log(Level.FINE, "last-minute output in {0} on {1}", new Object[] {remote, node});
+                    }
                     controller.cleanup(workspace);
                     if (exitCode == 0) {
                         getContext().onSuccess(exitCode);