QPID-2137 : Merged r899797 Update to QTC to correctly set QPID_WORK from trunk.

Updated excludes to match Trunk


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@900458 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 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 0426c4f45f..9bc252fe6e 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
@@ -53,9 +53,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 84d21a128e..14d5922299 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
@@ -475,7 +475,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
diff --git a/qpid/java/test-profiles/08StandaloneExcludes b/qpid/java/test-profiles/08StandaloneExcludes
index ed12973498..8dad24b0ce 100644
--- a/qpid/java/test-profiles/08StandaloneExcludes
+++ b/qpid/java/test-profiles/08StandaloneExcludes
@@ -42,3 +42,18 @@ org.apache.qpid.client.SessionCreateTest#*
 // 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
+