diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2009-08-18 03:39:04 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2009-08-18 03:39:04 +0000 |
| commit | 06d1a8ad0bbfb4580bd7ba9fca8622d951e7b5c9 (patch) | |
| tree | 25d3620021da6f52b55166bdd9e847291a2898fb /qpid/java/test-profiles | |
| parent | d2a98d4dfc63fd606418f5bd433be514bbe20d01 (diff) | |
| download | qpid-python-06d1a8ad0bbfb4580bd7ba9fca8622d951e7b5c9.tar.gz | |
This commit allows a limited number of failover tests to run under the SSL profile using SSL connections.
This commit should also fix the tests hanging under the SSL test profile due to port conflicts with SSL and failover ports.
FailoverBaseCase and FailoverTest is improved to handle the failover port without having to rely on port arithmetic.
The FailoverBaseCase is modified to use the failover.ssl connection factory when running under the SSL profile.
I have uncommented the FailoverTest from the cpp.ssl.excludes. However only a selected set of tests will run outside the cpp.clustered profile.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805267 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
| -rw-r--r-- | qpid/java/test-profiles/cpp.ssl.excludes | 2 | ||||
| -rw-r--r-- | qpid/java/test-profiles/default.testprofile | 3 | ||||
| -rw-r--r-- | qpid/java/test-profiles/test-provider.properties | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/qpid/java/test-profiles/cpp.ssl.excludes b/qpid/java/test-profiles/cpp.ssl.excludes index bf21ab9cc7..1828581d55 100644 --- a/qpid/java/test-profiles/cpp.ssl.excludes +++ b/qpid/java/test-profiles/cpp.ssl.excludes @@ -1 +1 @@ -org.apache.qpid.test.client.failover.FailoverTest#* +#org.apache.qpid.test.client.failover.FailoverTest#* diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile index 864cf149d4..49d4a25b82 100644 --- a/qpid/java/test-profiles/default.testprofile +++ b/qpid/java/test-profiles/default.testprofile @@ -19,7 +19,8 @@ log4j.debug=false test.port=15672 test.mport=18999 test.port.ssl=15671 -test.port.alt=15673 +test.port.alt=15772 +test.port.alt.ssl=15771 test.exclude=true profile.excludes=08TransientExcludes diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index 2479b5a5f0..e5cb18da0b 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/java/test-profiles/test-provider.properties @@ -21,13 +21,17 @@ test.port=5672 test.port.ssl=5671 -test.port.alt=5673 +test.port.alt=5772 +test.port.alt.ssl=5771 connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt};tcp://localhost:${test.port}'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' + +connectionfactory.failover.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' + connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1' connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt}' |