diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 00:57:50 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 00:57:50 +0000 |
| commit | 237532bd01dd49bd29a6209a2efefea8ae4d1434 (patch) | |
| tree | d4c9a08a21af619427c0b9852c53805d9bbeff9e | |
| parent | b2c03878add4cec8dc3280eac4b2c56545038bb8 (diff) | |
| download | qpid-python-237532bd01dd49bd29a6209a2efefea8ae4d1434.tar.gz | |
QPID-3861 : Run Python Message Grouping tests against the Java Broker; also fix small bug this uncovers
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291542 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | 2 | ||||
| -rw-r--r-- | qpid/java/test-profiles/python_tests/Java010PythonExcludes | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 891a492b7f..f43de76251 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -1895,7 +1895,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes if(context != null) { QueueEntry releasedNode = context.getReleasedEntry(); - return releasedNode == null || releasedNode.compareTo(entry) < 0; + return releasedNode != null && releasedNode.compareTo(entry) < 0; } else { diff --git a/qpid/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes index b61ac73183..6e05a21d91 100644 --- a/qpid/java/test-profiles/python_tests/Java010PythonExcludes +++ b/qpid/java/test-profiles/python_tests/Java010PythonExcludes @@ -22,12 +22,14 @@ #The broker does not support DTX qpid_tests.broker_0_10.dtx.* -#The broker does not support message groups -qpid_tests.broker_0_10.msg_groups.* - #The broker does not have the appropriate QMF support qpid_tests.broker_0_10.management.* qpid_tests.broker_0_10.stats.BrokerStatsTests.* +qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_default_group_id +qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_move_* +qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_purge_* +qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_query +qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_reroute #The broker does not use the same threshold alerting system (or the QMF support needed for the tests) qpid_tests.broker_0_10.threshold.* |