/hg/icedtea-web: Fixed DeadlockTest and listeners forwarding
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Aug 17 04:44:07 PDT 2012
changeset f12b2ffa191d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f12b2ffa191d
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Aug 17 13:44:33 2012 +0200
Fixed DeadlockTest and listeners forwarding
diffstat:
ChangeLog | 9 +++++++++
tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java | 8 ++++----
tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
diffs (48 lines):
diff -r fafa18b429f4 -r f12b2ffa191d ChangeLog
--- a/ChangeLog Wed Aug 15 09:39:53 2012 -0400
+++ b/ChangeLog Fri Aug 17 13:44:33 2012 +0200
@@ -1,3 +1,12 @@
+2012-08-17 Jiri Vanek <jvanek at redhat.com>
+
+ * tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java:
+ (testDeadLockTestTerminatedBody) removed tests for killed-process and
+ termination of remaining javas put on correct place.
+ * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+ (executeBrowser) stout and stderr listeners forwarded to next method in
+ correct order.
+
2012-08-14 Danesh Dadachanji <ddadacha at redhat.com>
Classpaths in jars' manifests are only considered when the applet is run
diff -r fafa18b429f4 -r f12b2ffa191d tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java
--- a/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java Wed Aug 15 09:39:53 2012 -0400
+++ b/tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java Fri Aug 17 13:44:33 2012 +0200
@@ -84,12 +84,12 @@
assertDeadlockTestLaunched(pr);
List<String> after = countJavaInstances();
ServerAccess.logOutputReprint("java2 " + jnlp + " : " + after.size());
+ killDiff(before, after);
String ss = "This process is hanging more than 30s. Should be killed";
Assert.assertFalse("stdout should not contains: " + ss + ", but did", pr.stdout.contains(ss));
-// Assert.assertTrue(pr.stderr.contains("xception"));, exception is thrown by engine,not by application
- Assert.assertTrue("testDeadLockTestTerminated should be terminated, but wasn't", pr.wasTerminated);
- Assert.assertNull("Killed process must have null return value. Have not - ", pr.returnValue);
- killDiff(before, after);
+// as we are tryng to terminate process as harmless as possible those two are no longer valid in all cases
+// Assert.assertTrue("testDeadLockTestTerminated should be terminated, but wasn't", pr.wasTerminated);
+// Assert.assertNull("Killed process must have null return value. Have not - ", pr.returnValue);
List<String> afterKill = countJavaInstances();
ServerAccess.logOutputReprint("java3 " + jnlp + " : " + afterKill.size());
Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
diff -r fafa18b429f4 -r f12b2ffa191d tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Wed Aug 15 09:39:53 2012 -0400
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Fri Aug 17 13:44:33 2012 +0200
@@ -548,7 +548,7 @@
return executeBrowser(getBrowserParams(), resource);
}
public ProcessResult executeBrowser(String resource,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
- return executeBrowser(getBrowserParams(), resource,stderrl,stdoutl);
+ return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl);
}
/**
More information about the distro-pkg-dev
mailing list