root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Fix test failure by cleaning up static state after tests
This commit is contained in:
Jesse Glick 2018-05-02 18:47:23 -04:00 committed by GitHub
parent ddbc4bbce7 828a7e0225
commit 3465da4764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/hudson/util/ProcessTree.java
View File

@ -382,7 +382,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
} }
private static Boolean vetoersExist; /* package */ static Boolean vetoersExist;
/** /**
* Gets the {@link ProcessTree} of the current system * Gets the {@link ProcessTree} of the current system

1
test/src/test/java/hudson/util/ProcessTreeKillerTest.java
View File

@ -38,6 +38,7 @@ public class ProcessTreeKillerTest {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
ProcessTree.vetoersExist = null;
if (null != process) if (null != process)
process.destroy(); process.destroy();
} }