diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 04:10:01 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 04:10:01 +0000 |
| commit | 7d437d2c16aee1e8bb5675e3bfc412fed93780bf (patch) | |
| tree | 07879305ad8797f0b942b11534ddd967af886179 /qpid/cpp | |
| parent | 05faf06ecb9b32e1edb537d82a7f0aca64cf9127 (diff) | |
| download | qpid-python-7d437d2c16aee1e8bb5675e3bfc412fed93780bf.tar.gz | |
NO-JIRA: fix fluffed merge in r1400258
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1400759 13f79535-47bb-0310-9956-ffa450edef68
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 |