Merge pull request #300 from jglick/EchoStepTest

[JENKINS-27057] Doubled-up log text
jenkinsci · Jan 13, 2016 · 6c4b0ba · 6c4b0ba
2 parents 30a80b4 + 6de84ed
commit 6c4b0ba
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 1 deletion.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/EchoStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/EchoStepTest.java
@@ -0,0 +1,70 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.workflow.steps;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.jenkinsci.plugins.workflow.actions.LogAction;
+import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
+import org.jenkinsci.plugins.workflow.graph.FlowGraphWalker;
+import org.jenkinsci.plugins.workflow.graph.FlowNode;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.jvnet.hudson.test.BuildWatcher;
+import org.jvnet.hudson.test.JenkinsRule;
+
+public class EchoStepTest {
+
+    @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
+    @Rule public JenkinsRule r = new JenkinsRule();
+
+    @Test public void smokes() throws Exception {
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("echo 'hello there'", true));
+        WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
+        List<LogAction> logActions = new ArrayList<LogAction>();
+        for (FlowNode n : new FlowGraphWalker(b.getExecution())) {
+            LogAction la = n.getAction(LogAction.class);
+            if (la != null) {
+                logActions.add(la);
+            }
+        }
+        assertEquals(1, logActions.size());
+        StringWriter w = new StringWriter();
+        logActions.get(0).getLogText().writeLogTo(0, w);
+        assertEquals("hello there", w.toString().trim());
+        Matcher m = Pattern.compile("hello there").matcher(JenkinsRule.getLog(b));
+        assertTrue("message printed once", m.find());
+        assertFalse("message not printed twice", m.find());
+    }
+
+}
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -368,7 +368,7 @@ private void copyLogs() {
                             modified = true;
                         }
                         if (logText.isComplete()) {
-                            logText.writeRawLogTo(entry.getValue(), logger); // defend against race condition?
+                            logText.writeRawLogTo(revised, logger); // defend against race condition?
                             assert !node.isRunning() : "LargeText.complete yet " + node + " claims to still be running";
                             logsToCopy.remove(id);
                             modified = true;