diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-09-17 11:37:29 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-09-17 11:37:29 +0000 |
| commit | b463cab2665d13d9f28b6a02b8166e4a3c8df219 (patch) | |
| tree | ed7b34da269116a3e150a38bcd822d0d5766f586 /java | |
| parent | 2440d16101a4a4f00912834a4c7cd4cc4cb7a37e (diff) | |
| download | qpid-python-b463cab2665d13d9f28b6a02b8166e4a3c8df219.tar.gz | |
Update to QpidTestCase to only check for broker.stopped lines until we have found the ready line. Added broker.stopped line to cpp.testprofile 'Exception constructed' this identifies port conflict issues. Local testing has shown that this works as expected.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@816150 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java | 2 | ||||
| -rw-r--r-- | java/test-profiles/cpp.testprofile | 1 | ||||
| -rw-r--r-- | java/test-profiles/default.testprofile | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 0acade8e4f..bed5d3242a 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -337,7 +337,7 @@ public class QpidTestCase extends TestCase latch.countDown(); } - if (latch != null && line.contains(stopped)) + if (!seenReady && line.contains(stopped)) { stopLine = line; } diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index 1d5416fe19..b3b979c786 100644 --- a/java/test-profiles/cpp.testprofile +++ b/java/test-profiles/cpp.testprofile @@ -8,6 +8,7 @@ broker.executable=${broker.dir}/qpidd broker.module.ssl=${module.dir}/ssl.so broker.module.cluster=${module.dir}/cluster.so broker.module.store=${store.module.dir}/msgstore.so +broker.stopped=Exception constructed broker.modules= broker.args= diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile index 49d4a25b82..86a5b2efb3 100644 --- a/java/test-profiles/default.testprofile +++ b/java/test-profiles/default.testprofile @@ -18,9 +18,10 @@ log4j.debug=false test.port=15672 test.mport=18999 +#Note : Management will start open second port on: mport + 100 : 19099 test.port.ssl=15671 -test.port.alt=15772 -test.port.alt.ssl=15771 +test.port.alt=25672 +test.port.alt.ssl=25671 test.exclude=true profile.excludes=08TransientExcludes |