changeset 1206:039af1289ac9

Increase server timeout for remote reproducers 2015-04-13 Jie Kang <jkang@redhat.com> Increase server timeout for remote reproducers * tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java: Timeout changed to 20s instead of default 10s
author Jie Kang <jkang@redhat.com>
date Mon, 13 Apr 2015 11:25:58 -0400
parents 0488d15d3f0e
children 4382cb0e63d2
files ChangeLog tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java
diffstat 2 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 13 10:38:15 2015 -0400
+++ b/ChangeLog	Mon Apr 13 11:25:58 2015 -0400
@@ -1,4 +1,11 @@
 2015-04-13  Jie Kang  <jkang@redhat.com>
+
+	Increase server timeout for remote reproducers
+	* tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java:
+	Timeout changed to 20s instead of default 10s
+	
+2015-04-13  Jie Kang  <jkang@redhat.com>
+
 	Kill processes in Integration Tests more cleanly; revised
     * Makefile.am:
     remove all instances of softkiller (softkiller no longer works)
@@ -13,6 +20,7 @@
     remove softkiller
 
 2015-04-13  Jie Kang  <jkang@redhat.com>
+
 	Add reproducers for jnlp_href attribute
 	* tests/reproducers/simple/JnlpHrefAttribute/resources/JnlpHrefAttribute.html:
 	* tests/reproducers/simple/JnlpHrefAttribute/resources/JnlpHrefAttribute.jnlp:	
--- a/tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java	Mon Apr 13 10:38:15 2015 -0400
+++ b/tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java	Mon Apr 13 11:25:58 2015 -0400
@@ -42,6 +42,9 @@
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
 import net.sourceforge.jnlp.annotations.Remote;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @Remote
@@ -51,6 +54,19 @@
     private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
     private final List<String> ll = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall", "-Xnofork"}));
 
+    private static final long defaultTimeout = server.PROCESS_TIMEOUT;
+
+    @BeforeClass
+    public static void setup() {
+        //Remote applications need to download files and take a little longer (20s)
+        server.PROCESS_TIMEOUT = 20 * 1000l;
+    }
+
+    @AfterClass
+    public static void teardown() {
+        server.PROCESS_TIMEOUT = defaultTimeout;
+    }
+
     @Test
     @NeedsDisplay
     public void topCoderRemoteTest() throws Exception {