diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-01-15 20:06:14 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-01-15 20:06:14 +0000 |
| commit | 9867f4dd62875248c8de5919d3763844ff436ba3 (patch) | |
| tree | e7c239982e56521d2b59dbd8be1c6aea41183843 /qpid/java | |
| parent | 2e406c09fd8015001d96a4aa7ed2864823f843ef (diff) | |
| download | qpid-python-9867f4dd62875248c8de5919d3763844ff436ba3.tar.gz | |
QPID-2137 : Update QpidTestCase to set QPID_WORK on the external broker based on the port of the running broker. This allows multiple brokers to be started by QTC with a given QPID_WORK value. Removed manual changing of QPID_WORK in FailoverBaseCase as there was no way to know what that value was later. All calls to startBroker in QTC will correctly append the port to the given QPID_WORK value. AcknowledgeOnMessageTest was updated to provide some extra debugging to help aid later investigation of why messages are not recieved after failover.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@899797 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 8 insertions, 5 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java index a2703be298..8de1053fc0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java @@ -105,7 +105,9 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message } else { - fail("All messages not received missing:" + _receivedAll.getCount() + "/" + NUM_MESSAGES); + long onQueue=((AMQSession) getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE)).getQueueDepth((AMQDestination) _queue); + fail("All messages not received missing:" + _receivedAll.getCount() + "/" + NUM_MESSAGES+" On Queue:"+onQueue); + } } @@ -140,6 +142,9 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message public void onMessage(Message message) { + // Log received Message for debugging + System.out.println("RECEIVED MESSAGE:" + message); + try { int count = NUM_MESSAGES - (int) _receivedAll.getCount(); 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 b1d14721bd..e7eaefca98 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 @@ -55,9 +55,6 @@ public class FailoverBaseCase extends QpidTestCase protected void setUp() throws java.lang.Exception { super.setUp(); - // Set QPID_WORK to $QPID_WORK/<getFailingPort()> - // or /tmp/<getFailingPort()> if QPID_WORK not set. - setSystemProperty("QPID_WORK", System.getProperty("QPID_WORK") + "/" + getFailingPort()); startBroker(getFailingPort()); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 5e209e69d6..d9b0a93132 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -505,7 +505,8 @@ public class QpidTestCase extends TestCase //Add the test name to the broker run. // DON'T change PNAME, qpid.stop needs this value. env.put("QPID_PNAME", "-DPNAME=QPBRKR -DTNAME=\"" + _testName + "\""); - env.put("QPID_WORK", System.getProperty("QPID_WORK")); + // Add the port to QPID_WORK to ensure unique working dirs for multi broker tests + env.put("QPID_WORK", System.getProperty("QPID_WORK")+ "/" + port); // Use the environment variable to set amqj.logging.level for the broker |