diff options
Diffstat (limited to 'jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java')
-rw-r--r-- | jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java index ca005199d9..8dd287f492 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java @@ -56,8 +56,8 @@ import org.eclipse.jetty.client.ssl.SslBytesTest.TLSRecord.Type; import org.eclipse.jetty.http.HttpParser; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.io.ManagedSelector; import org.eclipse.jetty.io.SelectChannelEndPoint; -import org.eclipse.jetty.io.SelectorManager.ManagedSelector; import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConnection; @@ -299,7 +299,7 @@ public class SslBytesServerTest extends SslBytesTest closeClient(client); } - @Test + @Test(timeout=60000) public void testHandshakeWithResumedSessionThenClose() throws Exception { // First socket will establish the SSL session @@ -381,7 +381,7 @@ public class SslBytesServerTest extends SslBytesTest Assert.assertThat(httpParses.get(), Matchers.lessThan(20)); } - @Test + @Test(timeout=60000) public void testHandshakeWithSplitBoundary() throws Exception { final SSLSocket client = newClient(); @@ -486,7 +486,7 @@ public class SslBytesServerTest extends SslBytesTest } } - @Test + @Test(timeout=60000) public void testClientHelloIncompleteThenReset() throws Exception { final SSLSocket client = newClient(); @@ -519,7 +519,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testClientHelloThenReset() throws Exception { final SSLSocket client = newClient(); @@ -550,7 +550,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testHandshakeThenReset() throws Exception { final SSLSocket client = newClient(); @@ -570,7 +570,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestIncompleteThenReset() throws Exception { final SSLSocket client = newClient(); @@ -612,7 +612,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestResponse() throws Exception { final SSLSocket client = newClient(); @@ -665,7 +665,7 @@ public class SslBytesServerTest extends SslBytesTest closeClient(client); } - @Test + @Test(timeout=60000) public void testHandshakeAndRequestOneByteAtATime() throws Exception { final SSLSocket client = newClient(); @@ -752,11 +752,11 @@ public class SslBytesServerTest extends SslBytesTest // Check that we did not spin TimeUnit.MILLISECONDS.sleep(1000); - Assert.assertThat(sslFills.get(), Matchers.lessThan(1000)); + Assert.assertThat(sslFills.get(), Matchers.lessThan(2000)); Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20)); // An average of 958 httpParses is seen in standard Oracle JDK's // An average of 1183 httpParses is seen in OpenJDK JVMs. - Assert.assertThat(httpParses.get(), Matchers.lessThan(500)); + Assert.assertThat(httpParses.get(), Matchers.lessThan(2000)); client.close(); @@ -782,7 +782,7 @@ public class SslBytesServerTest extends SslBytesTest } } - @Test + @Test(timeout=60000) public void testRequestWithCloseAlertAndShutdown() throws Exception { // See next test on why we only run in Linux @@ -850,7 +850,7 @@ public class SslBytesServerTest extends SslBytesTest Assert.assertThat(httpParses.get(), Matchers.lessThan(20)); } - @Test + @Test(timeout=60000) public void testRequestWithCloseAlert() throws Exception { // Currently we are ignoring this test on anything other then linux @@ -930,7 +930,7 @@ public class SslBytesServerTest extends SslBytesTest proxy.flushToServer(record); } - @Test + @Test(timeout=60000) public void testRequestWithRawClose() throws Exception { final SSLSocket client = newClient(); @@ -989,7 +989,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestWithImmediateRawClose() throws Exception { final SSLSocket client = newClient(); @@ -1046,7 +1046,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestWithBigContentWriteBlockedThenReset() throws Exception { // Don't run on Windows (buggy JVM) @@ -1107,7 +1107,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestWithBigContentReadBlockedThenReset() throws Exception { // Don't run on Windows (buggy JVM) @@ -1163,7 +1163,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestWithCloseAlertWithSplitBoundary() throws Exception { if (!OS.IS_LINUX) @@ -1251,7 +1251,7 @@ public class SslBytesServerTest extends SslBytesTest Assert.assertThat(httpParses.get(), Matchers.lessThan(20)); } - @Test + @Test(timeout=60000) public void testRequestWithContentWithSplitBoundary() throws Exception { final SSLSocket client = newClient(); @@ -1314,7 +1314,7 @@ public class SslBytesServerTest extends SslBytesTest closeClient(client); } - @Test + @Test(timeout=60000) public void testRequestWithBigContentWithSplitBoundary() throws Exception { final SSLSocket client = newClient(); @@ -1362,8 +1362,8 @@ public class SslBytesServerTest extends SslBytesTest // Check that we did not spin TimeUnit.MILLISECONDS.sleep(500); - Assert.assertThat(sslFills.get(), Matchers.lessThan(50)); - Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20)); + Assert.assertThat(sslFills.get(), Matchers.lessThan(100)); + Assert.assertThat(sslFlushes.get(), Matchers.lessThan(50)); Assert.assertThat(httpParses.get(), Matchers.lessThan(100)); Assert.assertNull(request.get(5, TimeUnit.SECONDS)); @@ -1384,8 +1384,8 @@ public class SslBytesServerTest extends SslBytesTest // Check that we did not spin TimeUnit.MILLISECONDS.sleep(500); - Assert.assertThat(sslFills.get(), Matchers.lessThan(50)); - Assert.assertThat(sslFlushes.get(), Matchers.lessThan(20)); + Assert.assertThat(sslFills.get(), Matchers.lessThan(100)); + Assert.assertThat(sslFlushes.get(), Matchers.lessThan(50)); Assert.assertThat(httpParses.get(), Matchers.lessThan(100)); closeClient(client); @@ -1485,7 +1485,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestWithBigContentWithRenegotiationInMiddleOfContent() throws Exception { assumeJavaVersionSupportsTLSRenegotiations(); @@ -1781,7 +1781,7 @@ public class SslBytesServerTest extends SslBytesTest closeClient(client); } - @Test + @Test(timeout=60000) public void testServerShutdownOutputClientDoesNotCloseServerCloses() throws Exception { final SSLSocket client = newClient(); @@ -1835,7 +1835,7 @@ public class SslBytesServerTest extends SslBytesTest Assert.assertFalse(serverEndPoint.get().isOpen()); } - @Test + @Test(timeout=60000) public void testPlainText() throws Exception { final SSLSocket client = newClient(); @@ -1866,7 +1866,7 @@ public class SslBytesServerTest extends SslBytesTest client.close(); } - @Test + @Test(timeout=60000) public void testRequestConcurrentWithIdleExpiration() throws Exception { final SSLSocket client = newClient(); |