Changeset 429 for trunk/icedtea-web/tests/reproducers/simple/deadlocktest

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java (modified) (5 diffs)

trunk/icedtea-web/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java

@@ -37 +37 @@
 
 import java.util.ArrayList;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
 import org.junit.Assert;
 import java.util.Arrays;
@@ -81 +81 @@
         List<String> before = countJavaInstances();
         ServerAccess.logOutputReprint("java1 " + jnlp + " : " + before.size());
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, jnlp);
+        ProcessResult pr = server.executeJavawsHeadless(null, jnlp);
         assertDeadlockTestLaunched(pr);
         List<String> after = countJavaInstances();
@@ -168 +168 @@
             ServerAccess.PROCESS_LOG = false;
             try {
-                ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"kill", "-9", string}));
+                ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"kill", "-9", string}));
             } finally {
                 ServerAccess.PROCESS_LOG = true;
@@ -183 +183 @@
         ServerAccess.PROCESS_LOG = false;
         try {
-            ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"ps", "-eo", "pid,ppid,stat,fname"}));
+            ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"ps", "-eo", "pid,ppid,stat,fname"}));
             Matcher m = Pattern.compile("\\s*\\d+\\s+\\d+ .+ java\\s*").matcher(pr.stdout);
             int i = 0;
@@ -206 +206 @@
         String s = "Deadlock test started";
         Assert.assertTrue("Deadlock test should print out " + s + ", but did not", pr.stdout.contains(s));
-        String ss = "xception";
-        Assert.assertFalse("Deadlock test should not stderr " + ss + " but did", pr.stderr.contains(ss));
         //each 3500 seconds deadlock test stdout something
         //timeout is 20s