Merge branch 'JENKINS-22641' of github.com:christ66/jenkins

0f3574bb · Jesse Glick · f4f28ff9 · 0826f09f · 0f3574bb
隐藏空白更改
内联并排

Showing with 1 addition and 5 deletion

test/src/test/java/hudson/util/ProcessTreeKillerTest.java test/src/test/java/hudson/util/ProcessTreeKillerTest.java +1 -5

未找到文件。
--- a/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
+++ b/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
@@ -47,11 +47,7 @@ public class ProcessTreeKillerTest extends HudsonTestCase {

        processJob.getBuildersList().add(new Shell("ps -ef | grep sleep"));

-        String log = processJob.scheduleBuild2(0).get().getLog();
-
-        System.err.println("LOGS: " + log);
-
-        assertFalse("Did not properly kill task", log.contains("sleep 100000"));
+        assertLogNotContains("sleep 100000", processJob.scheduleBuild2(0).get());
    }

 }