diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
| commit | 0ae82e5d20094e25c41adc3e3924f17984a7bce9 (patch) | |
| tree | 8713b63bcb6cba8550628af3874d259ff40c6a0d /qpid/tests/src | |
| parent | 454855a993904238a5401f145326943159f97532 (diff) | |
| download | qpid-python-0ae82e5d20094e25c41adc3e3924f17984a7bce9.tar.gz | |
QPID-3603: Merge new HA foundations.
Merged from qpid-3603-7. This is basic support for the new HA approach.
For information & limitations see qpid/cpp/design_docs/new-ha-design.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1245587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tests/src')
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_0_10/message.py | 3 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/message.py b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py index 204b6ebd23..c6095a0579 100644 --- a/qpid/tests/src/py/qpid_tests/broker_0_10/message.py +++ b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py @@ -1033,8 +1033,7 @@ class MessageTests(TestBase010): #release all even messages session.message_release(RangedSet(msg.id)) - #browse: - session.message_subscribe(queue="q", destination="b", acquire_mode=1) + session.message_subscribe(queue="q", destination="b", acquire_mode=0) b = session.incoming("b") b.start() for i in [2, 4, 6, 8, 10]: diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py index 4d6d77a46f..938d3b3ee2 100644 --- a/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py +++ b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py @@ -202,6 +202,10 @@ class MultiConsumerMsgGroupTests(Base): ## Queue = A-0, B-1, A-2, b-3, C-4 ## Owners= ^C1, ---, +C1, ---, --- + m2 = b1.fetch(0); + assert m2.properties['THE-GROUP'] == 'A' + assert m2.content['index'] == 0 + m2 = b1.fetch(0) assert m2.properties['THE-GROUP'] == 'B' assert m2.content['index'] == 1 @@ -713,6 +717,7 @@ class MultiConsumerMsgGroupTests(Base): assert rc.status == 0 queue.update() queue.msgDepth == 4 # the pending acquired A still counts! + s1.acknowledge() # verify all other A's removed.... s2 = self.setup_session() @@ -782,7 +787,7 @@ class MultiConsumerMsgGroupTests(Base): except Empty: pass assert count == 3 # non-A's - assert a_count == 1 # and one is an A + assert a_count == 2 # pending acquired message included in browse results s1.acknowledge() # ack the consumed A-0 self.qmf_session.delBroker(self.qmf_broker) @@ -829,7 +834,7 @@ class MultiConsumerMsgGroupTests(Base): # verify all other A's removed from msg-group-q s2 = self.setup_session() - b1 = s2.receiver("msg-group-q; {mode: browse}", options={"capacity":0}) + b1 = s2.receiver("msg-group-q", options={"capacity":0}) count = 0 try: while True: @@ -963,7 +968,7 @@ class MultiConsumerMsgGroupTests(Base): # verify all other A's removed.... s2 = self.setup_session() - b1 = s2.receiver("msg-group-q; {mode: browse}", options={"capacity":0}) + b1 = s2.receiver("msg-group-q", options={"capacity":0}) count = 0 try: while True: |