summaryrefslogtreecommitdiff
path: root/qpid/java/systests/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-10-23 08:06:31 +0000
committerKeith Wall <kwall@apache.org>2014-10-23 08:06:31 +0000
commit75e53bb929b7d24c7b003d5749f7b06af5b576ea (patch)
tree4f7e851546b864bc257a2a7593b04cd40fee8b17 /qpid/java/systests/src
parente5f51dad9dacccfd5b4ec8f37bf035512fc1a6c4 (diff)
downloadqpid-python-75e53bb929b7d24c7b003d5749f7b06af5b576ea.tar.gz
QPID-6174: [Java Rest Tests] Apply a HTTP connectiion timeout to the REST tests (to prevent Jetty misconfigurations etc hanging the test suit forever).
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633766 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index 63c9852dc4..469e6ce52b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
@@ -89,6 +89,7 @@ public class RestTestHelper
private File _passwdFile;
private boolean _useSslAuth;
static final String[] EXPECTED_QUEUES = { "queue", "ping" };
+ private final int _connectTimeout = Integer.getInteger("qpid.resttest_connection_timeout", 30000);
public RestTestHelper(int httpPort)
{
@@ -128,6 +129,7 @@ public class RestTestHelper
}
URL url = getManagementURL(path);
HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
+ httpCon.setConnectTimeout(_connectTimeout);
if(_useSslAuth)
{