You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/10/23 10:06:32 UTC

svn commit: r1633766 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java

Author: kwall
Date: Thu Oct 23 08:06:31 2014
New Revision: 1633766

URL: http://svn.apache.org/r1633766
Log:
QPID-6174: [Java Rest Tests] Apply a HTTP connectiion timeout to the REST tests (to prevent Jetty misconfigurations etc hanging the test suit forever).

Modified:
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1633766&r1=1633765&r2=1633766&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java Thu Oct 23 08:06:31 2014
@@ -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)
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org