Author: ritchiem
Date: Fri Jan 15 20:06:14 2010
New Revision: 899797
URL: http://svn.apache.org/viewvc?rev=899797&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java?rev=899797&r1=899796&r2=899797&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
Fri Jan 15 20:06:14 2010
@@ -105,7 +105,9 @@
}
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 void onMessage(Message message)
{
+ // Log received Message for debugging
+ System.out.println("RECEIVED MESSAGE:" + message);
+
try
{
int count = NUM_MESSAGES - (int) _receivedAll.getCount();
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=899797&r1=899796&r2=899797&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Fri Jan 15 20:06:14 2010
@@ -55,9 +55,6 @@
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());
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=899797&r1=899796&r2=899797&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Fri Jan 15 20:06:14 2010
@@ -505,7 +505,8 @@
//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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
