Merge pull request #70 from basil/JENKINS-41854

Test cases for JENKINS-41854

Author: dwnusbaum

src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java

@@ -48,6 +48,7 @@
 import hudson.slaves.NodeProperty;
 import hudson.slaves.OfflineCause;
 import hudson.slaves.RetentionStrategy;
+import hudson.slaves.WorkspaceList;
 import hudson.util.StreamCopyThread;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -94,6 +95,7 @@
 import static org.junit.Assert.*;
 import org.junit.Assume;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -322,6 +324,84 @@ private void startJnlpProc() throws Exception {
         });
     }
 
+    @Ignore("TODO currently fails with: hudson.remoting.RequestAbortedException: java.nio.channels.ClosedChannelException")
+    @Issue("JENKINS-41854")
+    @Test
+    public void contextualizeFreshFilePathAfterAgentReconnection() throws Exception {
+        Assume.assumeFalse("TODO not sure how to write a corresponding batch script", Functions.isWindows());
+        story.addStep(new Statement() {
+            @SuppressWarnings("SleepWhileInLoop")
+            @Override
+            public void evaluate() throws Throwable {
+                Logger LOGGER = Logger.getLogger(DurableTaskStep.class.getName());
+                LOGGER.setLevel(Level.FINE);
+                Handler handler = new ConsoleHandler();
+                handler.setLevel(Level.ALL);
+                LOGGER.addHandler(handler);
+                DumbSlave s = new DumbSlave("dumbo", "dummy", tmp.getRoot().getAbsolutePath(), "1", Node.Mode.NORMAL, "", new JNLPLauncher(), RetentionStrategy.NOOP, Collections.<NodeProperty<?>>emptyList());
+                story.j.jenkins.addNode(s);
+                startJnlpProc();
+                WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "demo");
+                File f1 = new File(story.j.jenkins.getRootDir(), "f1");
+                File f2 = new File(story.j.jenkins.getRootDir(), "f2");
+                new FileOutputStream(f1).close();
+                p.setDefinition(new CpsFlowDefinition(
+                        "node('dumbo') {\n" +
+                                "    sh 'touch \"" + f2 + "\"; while [ -f \"" + f1 + "\" ]; do sleep 1; done; echo finished waiting; rm \"" + f2 + "\"'\n" +
+                                "    sh 'echo Back again'\n" +
+                                "    echo 'OK, done'\n" +
+                                "}", true));
+                WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+                while (!f2.isFile()) {
+                    Thread.sleep(100);
+                }
+                assertTrue(b.isBuilding());
+                Computer computer = s.toComputer();
+                assertNotNull(computer);
+                FlowGraphWalker walker = new FlowGraphWalker(b.getExecution());
+                List<WorkspaceAction> actions = new ArrayList<>();
+                for (FlowNode node : walker) {
+                    WorkspaceAction action = node.getAction(WorkspaceAction.class);
+                    if (action != null) {
+                        actions.add(action);
+                    }
+                }
+                assertEquals(1, actions.size());
+                String workspacePath = actions.get(0).getWorkspace().getRemote();
+                assertWorkspaceLocked(computer, workspacePath);
+                killJnlpProc();
+                while (computer.isOnline()) {
+                    Thread.sleep(100);
+                }
+                startJnlpProc();
+                while (computer.isOffline()) {
+                    Thread.sleep(100);
+                }
+                assertWorkspaceLocked(computer, workspacePath);
+                assertTrue(f2.isFile());
+                assertTrue(f1.delete());
+                while (f2.isFile()) {
+                    Thread.sleep(100);
+                }
+                story.j.assertBuildStatusSuccess(story.j.waitForCompletion(b));
+                story.j.assertLogContains("finished waiting", b);
+                story.j.assertLogContains("Back again", b);
+                story.j.assertLogContains("OK, done", b);
+                killJnlpProc();
+            }
+        });
+    }
+
+    private static void assertWorkspaceLocked(Computer computer, String workspacePath) throws InterruptedException {
+        FilePath proposed = new FilePath(computer.getChannel(), workspacePath);
+        WorkspaceList.Lease lease = computer.getWorkspaceList().allocate(proposed);
+        try {
+            assertNotEquals(workspacePath, lease.path.getRemote());
+        } finally {
+            lease.release();
+        }
+    }
+
     @Test public void buildShellScriptQuick() throws Exception {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {