diff options
| author | Keith Wall <kwall@apache.org> | 2014-04-29 09:40:50 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-04-29 09:40:50 +0000 |
| commit | 7f4570b9a410081c12920da2ee483d42e3169f9e (patch) | |
| tree | 7290db855fe5e9295a260d3a500dcd23f2593f85 /qpid/java | |
| parent | 5953ca009492eb4d40a63960ea1d8f1854351548 (diff) | |
| download | qpid-python-7f4570b9a410081c12920da2ee483d42e3169f9e.tar.gz | |
QPID-5727: Prevent test failure in test environments already using the default HTTP management port (8080).
Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java | 2 | ||||
| -rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java index ff967e6e0e..98d4e3b33b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java @@ -67,6 +67,8 @@ public class BrokerStartupTest extends AbstractTestLogging 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://" diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 6f0a37ced9..2bda6872a5 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -136,8 +136,8 @@ public class QpidBrokerTestCase extends QpidTestCase 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 QpidTestCase 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 QpidTestCase 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"); |