You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/12/08 09:59:34 UTC
[2/2] httpcomponents-core git commit: Make futures used by
integration tests time out after 30 seconds
Make futures used by integration tests time out after 30 seconds
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/c0836fa6
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/c0836fa6
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/c0836fa6
Branch: refs/heads/4.4.x
Commit: c0836fa62fd8954eb06f10bb73295798887f6f58
Parents: 11da657
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sat Dec 8 10:55:51 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sat Dec 8 10:55:51 2018 +0100
----------------------------------------------------------------------
.../http/nio/integration/TestCustomSSL.java | 5 +++-
.../nio/integration/TestHttpAsyncHandlers.java | 29 +++++++++++---------
.../TestHttpAsyncHandlersPipelining.java | 15 ++++++----
.../nio/integration/TestTruncatedChunks.java | 7 +++--
4 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/c0836fa6/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
index f3f96f3..a1caec4 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
@@ -32,6 +32,7 @@ import java.math.BigInteger;
import java.net.InetSocketAddress;
import java.net.URL;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -63,6 +64,8 @@ import org.junit.Test;
public class TestCustomSSL {
+ private final static long RESULT_TIMEOUT_SEC = 30;
+
protected HttpServerNio server;
protected HttpClientNio client;
@@ -146,7 +149,7 @@ public class TestCustomSSL {
final HttpHost target = new HttpHost("localhost", address.getPort());
final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
final Future<HttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getStatusLine().getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/c0836fa6/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
index a0d8c2e..8cfcbef 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
@@ -34,6 +34,7 @@ import java.util.Collection;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
@@ -80,6 +81,8 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
+ private final static long RESULT_TIMEOUT_SEC = 30;
+
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
return Arrays.asList(new Object[][]{
@@ -149,7 +152,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -175,7 +178,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
}
@@ -206,7 +209,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -238,7 +241,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -269,7 +272,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -297,7 +300,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
}
@@ -327,7 +330,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
final Future<HttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
}
@@ -366,7 +369,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
final Future<HttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_BAD_REQUEST, response.getStatusLine().getStatusCode());
}
@@ -398,7 +401,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -530,7 +533,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
}
@@ -651,7 +654,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatusLine().getStatusCode());
}
@@ -676,7 +679,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getStatusLine().getStatusCode());
}
@@ -709,7 +712,7 @@ public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertNull(response.getEntity());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/c0836fa6/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java
index 53d3689..114f827 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java
@@ -37,6 +37,7 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.apache.http.ConnectionClosedException;
import org.apache.http.HttpEntityEnclosingRequest;
@@ -87,6 +88,8 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
+ private final static long RESULT_TIMEOUT_SEC = 30;
+
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
return Arrays.asList(new Object[][]{
@@ -166,7 +169,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final List<HttpResponse> responses = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
for (final HttpResponse response: responses) {
@@ -200,7 +203,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final List<HttpResponse> responses = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
for (final HttpResponse response: responses) {
@@ -244,7 +247,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final List<HttpResponse> responses = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
for (final HttpResponse response: responses) {
@@ -332,7 +335,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
while (!queue.isEmpty()) {
final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final List<HttpResponse> responses = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
for (final HttpResponse response: responses) {
@@ -396,7 +399,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
final Future<List<HttpResponse>> future = this.client.executePipelined(target, requestProducers, responseConsumers, null, null);
try {
- future.get();
+ future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
} catch (final ExecutionException ex) {
final Throwable cause = ex.getCause();
Assert.assertTrue(cause instanceof ConnectionClosedException);
@@ -405,7 +408,7 @@ public class TestHttpAsyncHandlersPipelining extends HttpCoreNIOTestBase {
Assert.assertTrue(c1.isDone());
Assert.assertNotNull(c1.getResult());
Assert.assertTrue(c2.isDone());
-// Assert.assertNotNull(c2.getResult());
+ Assert.assertNotNull(c2.getResult());
Assert.assertTrue(c3.isDone());
Assert.assertNull(c3.getResult());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/c0836fa6/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
index 797a6a5..0e678eb 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
@@ -33,6 +33,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
@@ -76,6 +77,8 @@ import org.junit.Test;
*/
public class TestTruncatedChunks extends HttpCoreNIOTestBase {
+ private final static long RESULT_TIMEOUT_SEC = 30;
+
@Before
public void setUp() throws Exception {
initServer();
@@ -182,7 +185,7 @@ public class TestTruncatedChunks extends HttpCoreNIOTestBase {
final BasicHttpRequest request = new BasicHttpRequest("GET", pattern + "x" + count);
final Future<HttpResponse> future = this.client.execute(target, request);
try {
- future.get();
+ future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.fail("ExecutionException should have been thrown");
} catch (final ExecutionException ex) {
final Throwable cause = ex.getCause();
@@ -258,7 +261,7 @@ public class TestTruncatedChunks extends HttpCoreNIOTestBase {
new LenientAsyncResponseConsumer(),
null, null);
- final HttpResponse response = future.get();
+ final HttpResponse response = future.get(RESULT_TIMEOUT_SEC, TimeUnit.SECONDS);
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
Assert.assertEquals(new String(GARBAGE, Consts.ISO_8859_1.name()),