Merge
authorrriggs
Thu, 17 Sep 2015 13:33:33 -0400
changeset 32658 dc687d3e31ab
parent 32657 8c49f68497e3 (diff)
parent 32654 23ae9cdf149e (current diff)
child 32659 52d938abd6ba
Merge
jdk/test/sun/security/tools/jarsigner/warnings.sh
--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Thu Sep 17 18:04:53 2015 +0200
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Thu Sep 17 13:33:33 2015 -0400
@@ -96,8 +96,6 @@
             ConcurrentHashMap<ProcessHandle, ProcessHandle> processes = new ConcurrentHashMap<>();
             List<ProcessHandle> children = getChildren(ProcessHandle.current());
             children.forEach(ProcessUtil::printProcess);
-            Assert.assertEquals(children.size(), 0,
-                    "Expected to start with zero children; " + children);
 
             JavaChild proc = JavaChild.spawnJavaChild("stdin");
             procHandle = proc.toHandle();
@@ -186,10 +184,6 @@
             children.forEach(p -> printProcess(p, "after onExit:"));
 
             Assert.assertEquals(proc.isAlive(), false, "destroyed process is alive:: %s%n" + proc);
-
-            List<ProcessHandle> children2 = getAllChildren(procHandle);
-            printf(" children2: %s%n", children2.toString());
-            Assert.assertEquals(children2.size(), 0, "After onExit, expected no children");
         } catch (IOException | InterruptedException ex) {
             Assert.fail(ex.getMessage());
         } finally {