Merge pull request #277 from jglick/diag-JENKINS-30395

[JENKINS-30395] Preventing a recurrent ClosedByInterruptException in CI
jenkinsci · Dec 18, 2015 · 3d85711 · 3d85711
2 parents 5bf7826 + 2876ca5
commit 3d85711
Show file tree

Hide file tree

Showing 40 changed files with 133 additions and 48 deletions.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/CpsFlowExecutionTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/CpsFlowExecutionTest.java
@@ -50,7 +50,7 @@
 
 public class CpsFlowExecutionTest {
 
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     private static WeakReference<ClassLoader> LOADER;
     public static void register(Object o) {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/CpsScmFlowDefinitionTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/CpsScmFlowDefinitionTest.java
@@ -60,7 +60,7 @@
 
 public class CpsScmFlowDefinitionTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
     @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
 
     @Test public void basics() throws Exception {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/DSLTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/DSLTest.java
@@ -37,7 +37,7 @@
  */
 public class DSLTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void overrideFunction() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java
@@ -49,7 +49,7 @@
 public class DynamicEnvironmentExpanderTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Issue("JENKINS-26163")
     @Test public void dynamics() {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/EnvWorkflowTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/EnvWorkflowTest.java
@@ -36,7 +36,7 @@
  */
 public class EnvWorkflowTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     /**
      * Verifies if NODE_NAME environment variable is available on a slave node and on master.

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/JenkinsRuleExt.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/JenkinsRuleExt.java
@@ -34,11 +34,19 @@
 import hudson.slaves.SlaveComputer;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.Description;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+import org.jvnet.hudson.test.HudsonHomeLoader;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.RestartableJenkinsRule;
 
 /**
  * Utilities that could be added to {@link JenkinsRule} in the future but are not yet available in our baseline version.
@@ -80,6 +88,61 @@ private static class SpecialEnvComputer extends SlaveComputer {
         }
     }
 
+    public static JenkinsRule workAroundJenkins30395() {
+        return new JenkinsRule() {
+            @Override public void before() throws Throwable {
+                if (Thread.interrupted()) {
+                    System.err.println("was interrupted before start");
+                }
+                super.before();
+            }
+        };
+    }
+    public static RestartableJenkinsRule workAroundJenkins30395Restartable() {
+        return new RestartableJenkinsRule() {
+            private Description description;
+            private final List<Statement> steps = new ArrayList<Statement>();
+            private TemporaryFolder tmp = new TemporaryFolder();
+            private Object target;
+            @Override
+            public Statement apply(final Statement base, FrameworkMethod method, Object target) {
+                this.description = Description.createTestDescription(
+                        method.getMethod().getDeclaringClass(), method.getName(), method.getAnnotations());
+                this.target = target;
+                return tmp.apply(new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        home = tmp.newFolder();
+                        base.evaluate();
+                        run();
+                    }
+                }, description);
+            }
+            public void addStep(final Statement step) {
+                steps.add(new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        j.jenkins.getInjector().injectMembers(step);
+                        j.jenkins.getInjector().injectMembers(target);
+                        step.evaluate();
+                    }
+                });
+            }
+            private void run() throws Throwable {
+                HudsonHomeLoader loader = new HudsonHomeLoader() {
+                    @Override
+                    public File allocate() throws Exception {
+                        return home;
+                    }
+                };
+                for (Statement step : steps) {
+                    j = workAroundJenkins30395().with(loader);
+                    j.apply(step,description).evaluate();
+                }
+            }
+        };
+    }
+
     private JenkinsRuleExt() {}
 
 }
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java
@@ -46,7 +46,7 @@
 public abstract class SingleJobTestBase extends Assert {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     // currently executing workflow and its build
     public WorkflowJob p;

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowRunRestartTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowRunRestartTest.java
@@ -50,7 +50,7 @@
 public class WorkflowRunRestartTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Issue("JENKINS-25550")
     @Test public void hardKill() throws Exception {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowRunTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowRunTest.java
@@ -66,7 +66,7 @@
 public class WorkflowRunTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void basics() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java
@@ -4,6 +4,7 @@
 import static java.util.Arrays.asList;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsThreadDump.ThreadInfo;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -19,8 +20,7 @@
 public class CpsThreadDumpTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+    @Rule public JenkinsRule j = JenkinsRuleExt.workAroundJenkins30395();
     private WorkflowJob p;
 
     @Before

diff --git a/...or/src/test/java/org/jenkinsci/plugins/workflow/cps/global/WorkflowLibRepositoryTest.java b/...or/src/test/java/org/jenkinsci/plugins/workflow/cps/global/WorkflowLibRepositoryTest.java
@@ -15,6 +15,7 @@
 import org.jvnet.hudson.test.RestartableJenkinsRule;
 import javax.inject.Inject;
 import org.apache.commons.io.FileUtils;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.runners.model.Statement;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -25,8 +26,8 @@
  * @author Kohsuke Kawaguchi
  */
 public class WorkflowLibRepositoryTest {
-    @Rule
-    public RestartableJenkinsRule story = new RestartableJenkinsRule();
+
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Inject
     Jenkins jenkins;

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.workflow.cps.steps;
 
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -17,7 +18,7 @@
 public class LoadStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test
     public void basics() throws Exception {

diff --git a/...egator/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java b/...egator/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java
@@ -2,6 +2,7 @@
 
 import javax.inject.Inject;
 import jenkins.model.Jenkins;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -20,8 +21,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class RestartingLoadStepTest {
-    @Rule
-    public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Inject
     Jenkins jenkins;

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ArtifactArchiverStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ArtifactArchiverStepTest.java
@@ -12,13 +12,13 @@
 import org.jvnet.hudson.test.JenkinsRule;
 
 import java.util.Arrays;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 public class ArtifactArchiverStepTest extends Assert {
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+    @Rule public JenkinsRule j = JenkinsRuleExt.workAroundJenkins30395();
 
     /**
      * Archive and unarchive file

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStepTest.java
@@ -26,6 +26,7 @@
 
 import hudson.model.Result;
 import jenkins.model.CauseOfInterruption;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -36,7 +37,7 @@
 
 public class CatchErrorStepTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void specialStatus() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
@@ -30,6 +30,7 @@
 import hudson.tasks.junit.TestResultAction;
 import java.util.List;
 import javax.mail.internet.InternetAddress;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -44,7 +45,7 @@
 public class CoreStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void artifactArchiver() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java
@@ -62,7 +62,7 @@
 public class CoreWrapperStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Test public void useWrapper() throws Exception {
         story.addStep(new Statement() {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/DeleteDirStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/DeleteDirStepTest.java
@@ -39,11 +39,11 @@
 
 import hudson.FilePath;
 import hudson.model.queue.QueueTaskFuture;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 
 public class DeleteDirStepTest {
 
-    @Rule
-    public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test
     public void testDeleteEmptyWorkspace() throws Exception {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/EnvStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/EnvStepTest.java
@@ -24,6 +24,7 @@
 
 package org.jenkinsci.plugins.workflow.steps;
 
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -38,7 +39,7 @@
 public class EnvStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     @Test public void overriding() {
         story.addStep(new Statement() {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/IsUnixStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/IsUnixStepTest.java
@@ -24,6 +24,7 @@
 
 package org.jenkinsci.plugins.workflow.steps;
 
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Test;
@@ -32,7 +33,7 @@
 
 public class IsUnixStepTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void basics() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/MailStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/MailStepTest.java
@@ -38,14 +38,14 @@
 import javax.mail.Message;
 import javax.mail.internet.MimeMultipart;
 import java.io.IOException;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 
 /**
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */
 public class MailStepTest {
 
-    @Rule
-    public JenkinsRule jenkinsRule = new JenkinsRule();
+    @Rule public JenkinsRule jenkinsRule = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test
     public void test_missing_subject() throws Exception {

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java
@@ -26,6 +26,7 @@
 
 import hudson.Functions;
 import java.io.File;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -40,7 +41,7 @@
 public class PushdStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
 
     private String pwdStep() {
         return Functions.isWindows() ? "bat 'cd'" : "sh 'pwd'";

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PwdStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PwdStepTest.java
@@ -24,6 +24,7 @@
 
 package org.jenkinsci.plugins.workflow.steps;
 
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Test;
@@ -32,7 +33,7 @@
 
 public class PwdStepTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void basics() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ReadWriteFileStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ReadWriteFileStepTest.java
@@ -25,6 +25,7 @@
 package org.jenkinsci.plugins.workflow.steps;
 
 import hudson.Functions;
+import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -35,7 +36,7 @@
 
 public class ReadWriteFileStepTest {
 
-    @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
 
     @Test public void basics() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");