diff options
Diffstat (limited to 'qpid/cpp')
| -rwxr-xr-x | qpid/cpp/src/tests/ha_tests.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index 047caf6dcb..edaced25c1 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -745,7 +745,6 @@ acl deny all all cluster[1].wait_queue("q") # Not timed out yet cluster[1].wait_no_queue("q") # Wait for timeout -<<<<<<< HEAD def test_alt_exchange_dup(self): """QPID-4349: if a queue has an alterante exchange and is deleted the messages appear twice on the alternate, they are rerouted once by the @@ -764,8 +763,6 @@ acl deny all all s.sender("q;{delete:always}").close() cluster[1].assert_browse_backup("altq", messages) -||||||| parent of c584515... Bug 868360 - QPID-4379: HA does not properly handle expired messages. -======= def test_expired(self): """Regression test for QPID-4379: HA does not properly handle expired messages""" # Race between messages expiring and HA replicating consumer. @@ -777,7 +774,6 @@ acl deny all all cluster.start() send_ttl_messages() ->>>>>>> c584515... Bug 868360 - QPID-4379: HA does not properly handle expired messages. def fairshare(msgs, limit, levels): """ Generator to return prioritised messages in expected order for a given fairshare limit |