Merge pull request #3419 from dwnusbaum/JENKINS-9104-test-fix

Fix test failure by cleaning up static state after tests
jenkinsci · May 2, 2018 · 3465da4 · 3465da4
2 parents ddbc4bb + 828a7e0
commit 3465da4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
@@ -382,7 +382,7 @@ public interface ProcessCallable<T> extends Serializable {
     }
 
 
-    private static Boolean vetoersExist;
+    /* package */ static Boolean vetoersExist;
 
     /**
      * Gets the {@link ProcessTree} of the current system

diff --git a/test/src/test/java/hudson/util/ProcessTreeKillerTest.java b/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
@@ -38,6 +38,7 @@ public class ProcessTreeKillerTest {
 
     @After
     public void tearDown() throws Exception {
+        ProcessTree.vetoersExist = null;
         if (null != process)
             process.destroy();
     }