qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1590929 - in /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid: server/BrokerStartupTest.java test/utils/QpidBrokerTestCase.java
Date Tue, 29 Apr 2014 09:40:50 GMT
Author: kwall
Date: Tue Apr 29 09:40:50 2014
New Revision: 1590929

URL: http://svn.apache.org/r1590929
Log:
QPID-5727: Prevent test failure in test environments already using the default HTTP management
port (8080).

Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.

Modified:
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1590929&r1=1590928&r2=1590929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
(original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
Tue Apr 29 09:40:50 2014
@@ -67,6 +67,8 @@ public class BrokerStartupTest extends A
             setTestSystemProperty("qpid.amqp_port",String.valueOf(port));
             setTestSystemProperty("qpid.jmx_port",String.valueOf(managementPort));
             setTestSystemProperty("qpid.rmi_port",String.valueOf(connectorServerPort));
+            setTestSystemProperty("qpid.http_port",String.valueOf(DEFAULT_HTTP_MANAGEMENT_PORT));
+
             startBroker(port, null);
 
             AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1590929&r1=1590928&r2=1590929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Tue Apr 29 09:40:50 2014
@@ -136,8 +136,8 @@ public class QpidBrokerTestCase extends 
     public static final int DEFAULT_SSL_PORT_VALUE = 5671;
     public static final int DEFAULT_JMXPORT_REGISTRYSERVER = 8999;
     public static final int JMXPORT_CONNECTORSERVER_OFFSET = 100;
-    public static final int DEFAULT_HTTP_MANAGEMENT_PORT = 8080;
-    public static final int DEFAULT_HTTPS_MANAGEMENT_PORT = 8443;
+    public static final int DEFAULT_HTTP_MANAGEMENT_PORT_VALUE = 8080;
+    public static final int DEFAULT_HTTPS_MANAGEMENT_PORT_VALUE = 8443;
 
     // values
     protected static final String JAVA = "java";
@@ -148,6 +148,8 @@ public class QpidBrokerTestCase extends 
     public static final int DEFAULT_PORT = Integer.getInteger("test.port", DEFAULT_PORT_VALUE);
     public static final int FAILING_PORT = Integer.parseInt(System.getProperty("test.port.alt"));
     public static final int DEFAULT_MANAGEMENT_PORT = Integer.getInteger("test.mport", DEFAULT_JMXPORT_REGISTRYSERVER);
+    public static final int DEFAULT_HTTP_MANAGEMENT_PORT = Integer.getInteger("test.hport",
DEFAULT_HTTP_MANAGEMENT_PORT_VALUE);
+    public static final int DEFAULT_HTTPS_MANAGEMENT_PORT = Integer.getInteger("test.hsport",
DEFAULT_HTTPS_MANAGEMENT_PORT_VALUE);
     public static final int DEFAULT_SSL_PORT = Integer.getInteger("test.port.ssl", DEFAULT_SSL_PORT_VALUE);
 
     protected String _brokerLanguage = System.getProperty(BROKER_LANGUAGE, JAVA);
@@ -550,6 +552,7 @@ public class QpidBrokerTestCase extends 
                 setSystemProperty("test.mport");
                 setSystemProperty("test.cport");
                 setSystemProperty("test.hport");
+                setSystemProperty("test.hsport");
                 setSystemProperty("test.port.ssl");
                 setSystemProperty("test.port.alt");
                 setSystemProperty("test.port.alt.ssl");



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


Mime
View raw message