Author: astitcher
Date: Mon Oct 22 04:10:01 2012
New Revision: 1400759
URL: http://svn.apache.org/viewvc?rev=1400759&view=rev
Log:
NO-JIRA: fix fluffed merge in r1400258
Modified:
qpid/trunk/qpid/cpp/src/tests/ha_tests.py
Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1400759&r1=1400758&r2=1400759&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Mon Oct 22 04:10:01 2012
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
