Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-11-12 02:51:31 +0000
committerGreg Wilkins2014-11-12 02:51:31 +0000
commite0fbd6d9f2833ab715152a72ed88b69be6bc6f94 (patch)
tree4c4b447a7845f055f7db0a7dcc58c796790a7d4e /jetty-servlets
parent5fe992bf04bb79e03c2cd83b1cf92aaf951b415e (diff)
downloadorg.eclipse.jetty.project-e0fbd6d9f2833ab715152a72ed88b69be6bc6f94.tar.gz
org.eclipse.jetty.project-e0fbd6d9f2833ab715152a72ed88b69be6bc6f94.tar.xz
org.eclipse.jetty.project-e0fbd6d9f2833ab715152a72ed88b69be6bc6f94.zip
Increased timeout to 5s for gzip tests.
Writing large mp3's 1 byte with flush can be slow and 2s was not enough.
Diffstat (limited to 'jetty-servlets')
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java5
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java10
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java4
3 files changed, 11 insertions, 8 deletions
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
index ba9a691212..82c728c8ab 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
@@ -137,7 +137,10 @@ public class GzipFilterContentLengthTest
tester.start();
- HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),5,TimeUnit.SECONDS);
+
+ if (response.getStatus()!=200)
+ System.err.println("DANG!!!! "+response);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
index d7c1ce9e6c..d3387a38fc 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
@@ -164,7 +164,7 @@ public class GzipFilterDefaultTest
tester.assertIsResponseGzipCompressed("POST","file.txt");
tester.assertIsResponseGzipCompressed("WIBBLE","file.txt");
- response = tester.executeRequest("GET","/context/file.txt",2,TimeUnit.SECONDS);
+ response = tester.executeRequest("GET","/context/file.txt",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.OK_200));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@@ -225,7 +225,7 @@ public class GzipFilterDefaultTest
HttpTester.Response response;
- response = tester.executeRequest("GET","/context/empty.txt",2,TimeUnit.SECONDS);
+ response = tester.executeRequest("GET","/context/empty.txt",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.OK_200));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@@ -569,7 +569,7 @@ public class GzipFilterDefaultTest
{
tester.start();
- HttpTester.Response response = tester.executeRequest("GET","/context/",2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest("GET","/context/",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.NO_CONTENT_204));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@@ -599,7 +599,7 @@ public class GzipFilterDefaultTest
{
tester.start();
- HttpTester.Response response = tester.executeRequest("GET","/context/",2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest("GET","/context/",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.BAD_REQUEST_400));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@@ -736,7 +736,7 @@ public class GzipFilterDefaultTest
public HttpTester.Response assertIsResponseNotGzipCompressed(GzipTester tester, String method, String filename, int expectedFilesize, int status)
throws Exception
{
- HttpTester.Response response = tester.executeRequest(method,"/context/" + filename,2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest(method,"/context/" + filename,5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(status));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
index ce217d4878..203b731d5f 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
@@ -139,7 +139,7 @@ public class GzipFilterLayeredTest
tester.start();
- HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),5,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));
@@ -186,7 +186,7 @@ public class GzipFilterLayeredTest
tester.start();
- HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
+ HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),5,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));

Back to the top