Author: ritchiem
Date: Mon Jan 18 16:54:45 2010
New Revision: 900458
URL: http://svn.apache.org/viewvc?rev=900458&view=rev
Log:
QPID-2137 : Merged r899797 Update to QTC to correctly set QPID_WORK from trunk.
Updated excludes to match Trunk
Modified:
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/branches/0.5.x-dev/qpid/java/test-profiles/08StandaloneExcludes
Modified:
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java?rev=900458&r1=900457&r2=900458&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
Mon Jan 18 16:54:45 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/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=900458&r1=900457&r2=900458&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Mon Jan 18 16:54:45 2010
@@ -53,9 +53,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/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=900458&r1=900457&r2=900458&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Mon Jan 18 16:54:45 2010
@@ -475,7 +475,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
Modified: qpid/branches/0.5.x-dev/qpid/java/test-profiles/08StandaloneExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/test-profiles/08StandaloneExcludes?rev=900458&r1=900457&r2=900458&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/test-profiles/08StandaloneExcludes
(original)
+++ qpid/branches/0.5.x-dev/qpid/java/test-profiles/08StandaloneExcludes Mon
Jan 18 16:54:45 2010
@@ -42,3 +42,18 @@
// Excluding here does not reduce test coverage.
org.apache.qpid.server.configuration.ServerConfigurationFileTest#*
+org.apache.qpid.test.unit.ack.AcknowledgeTest#testNoAck
+org.apache.qpid.test.unit.ack.AcknowledgeOnMessageTest#testNoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testClientAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testAutoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testTransacted
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testDupsOk
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testNoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testPreAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testClientAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testAutoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testTransacted
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testDupsOk
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testNoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testPreAck
+
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
