diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-09-21 15:41:33 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-09-21 15:41:33 +0000 |
| commit | e4dc41ed4d12c81a9683d69f6328b2de63c9288f (patch) | |
| tree | b3cedbc1bd2808c00629160d5a84a88d3dc3aaa6 | |
| parent | 430ded68ff2769b0e6194a407f7c0c329e94e848 (diff) | |
| download | qpid-python-e4dc41ed4d12c81a9683d69f6328b2de63c9288f.tar.gz | |
FailoverBaseCase has not been using the testprofile defined test.port.alt for the failover server. As a result the connection has been failing. Updated to use correct system property and added text to both default.testprofile and test-provider.properties to ensure that the changes are made in both locations, Ideally JNDI connection would use the same system property that is used by QTC for starting the broker. However I don't believe that it is currently doing that.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@817295 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 11 insertions, 5 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java index 1bef07fcd5..9a8fb8fde0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java @@ -28,7 +28,7 @@ public class FailoverBaseCase extends QpidTestCase { public static int FAILING_VM_PORT = 2; - public static int FAILING_PORT = DEFAULT_PORT + 100; + public static int FAILING_PORT = Integer.parseInt(System.getProperty("test.port.alt")); protected int failingPort; diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile index 86a5b2efb3..63ad03f08b 100644 --- a/qpid/java/test-profiles/default.testprofile +++ b/qpid/java/test-profiles/default.testprofile @@ -16,6 +16,8 @@ root.logging.level=warn log4j.configuration=file:///${test.profiles}/log4j-test.xml log4j.debug=false +# Note test-provider.properties also has variables of same name. +# Keep in sync test.port=15672 test.mport=18999 #Note : Management will start open second port on: mport + 100 : 19099 diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index e5cb18da0b..a349b0fcbf 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/java/test-profiles/test-provider.properties @@ -19,10 +19,14 @@ # # -test.port=5672 -test.port.ssl=5671 -test.port.alt=5772 -test.port.alt.ssl=5771 +# Copied from default.testprofile +test.port=15672 +test.mport=18999 +#Note : Java Management will start open second port on: mport + 100 : 19099 +test.port.ssl=15671 +test.port.alt=25672 +test.port.alt.ssl=25671 + connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' |