You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2008/06/05 19:51:34 UTC
svn commit: r663675 - in /incubator/qpid/trunk/qpid/python:
cpp_failing_0-10.txt tests_0-10/dtx.py tests_0-10/execution.py
tests_0-10/message.py tests_0-10/testlib.py
Author: gsim
Date: Thu Jun 5 10:51:34 2008
New Revision: 663675
URL: http://svn.apache.org/viewvc?rev=663675&view=rev
Log:
cleanup old irrelevant tests (from 0-10 preview functions)
fix dtx.recover test
Removed:
incubator/qpid/trunk/qpid/python/tests_0-10/execution.py
incubator/qpid/trunk/qpid/python/tests_0-10/testlib.py
Modified:
incubator/qpid/trunk/qpid/python/cpp_failing_0-10.txt
incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py
incubator/qpid/trunk/qpid/python/tests_0-10/message.py
Modified: incubator/qpid/trunk/qpid/python/cpp_failing_0-10.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/cpp_failing_0-10.txt?rev=663675&r1=663674&r2=663675&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/cpp_failing_0-10.txt (original)
+++ incubator/qpid/trunk/qpid/python/cpp_failing_0-10.txt Thu Jun 5 10:51:34 2008
@@ -1,13 +0,0 @@
-tests.codec.FieldTableTestCase.test_field_table_decode
-tests.codec.FieldTableTestCase.test_field_table_multiple_name_value_pair
-tests.codec.FieldTableTestCase.test_field_table_name_value_pair
-tests_0-10.execution.ExecutionTests.test_flush
-tests_0-10.dtx.DtxTests.test_recover
-tests_0-10.message.MessageTests.test_no_size
-tests_0-10.message.MessageTests.test_qos_prefetch_count
-tests_0-10.message.MessageTests.test_qos_prefetch_size
-tests_0-10.message.MessageTests.test_recover
-tests_0-10.message.MessageTests.test_recover_requeue
-tests_0-10.testlib.TestBaseTest.testAssertEmptyFail
-tests_0-10.testlib.TestBaseTest.testAssertEmptyPass
-tests_0-10.testlib.TestBaseTest.testMessageProperties
Modified: incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py?rev=663675&r1=663674&r2=663675&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py (original)
+++ incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py Thu Jun 5 10:51:34 2008
@@ -653,22 +653,19 @@
session.dtx_rollback(xid=tx)
xids = session.dtx_recover().in_doubt
- print "xids=%s" % xids
#rollback the prepared transactions returned by recover
for x in xids:
session.dtx_rollback(xid=x)
#validate against the expected list of prepared transactions
- actual = set(xids)
- expected = set(prepared)
+ actual = set([x.global_id for x in xids]) #TODO: come up with nicer way to test these
+ expected = set([x.global_id for x in prepared])
intersection = actual.intersection(expected)
if intersection != expected:
missing = expected.difference(actual)
extra = actual.difference(expected)
- for x in missing:
- session.dtx_rollback(xid=x)
self.fail("Recovered xids not as expected. missing: %s; extra: %s" % (missing, extra))
def test_bad_resume(self):
Modified: incubator/qpid/trunk/qpid/python/tests_0-10/message.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/tests_0-10/message.py?rev=663675&r1=663674&r2=663675&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/tests_0-10/message.py (original)
+++ incubator/qpid/trunk/qpid/python/tests_0-10/message.py Thu Jun 5 10:51:34 2008
@@ -304,199 +304,6 @@
self.fail("Got unexpected message: " + extra.body)
except Empty: None
-
- def test_recover(self):
- """
- Test recover behaviour
- """
- session = self.session
- session.queue_declare(queue="queue-a", exclusive=True, auto_delete=True)
- session.queue_bind(exchange="amq.fanout", queue="queue-a")
- session.queue_declare(queue="queue-b", exclusive=True, auto_delete=True)
- session.queue_bind(exchange="amq.fanout", queue="queue-b")
-
- self.subscribe(queue="queue-a", destination="unconfirmed", confirm_mode=1)
- self.subscribe(queue="queue-b", destination="confirmed", confirm_mode=0)
- confirmed = session.incoming("confirmed")
- unconfirmed = session.incoming("unconfirmed")
-
- data = ["One", "Two", "Three", "Four", "Five"]
- for d in data:
- session.message_transfer(destination="amq.fanout", content=Content(body=d))
-
- for q in [confirmed, unconfirmed]:
- for d in data:
- self.assertEqual(d, q.get(timeout=1).content.body)
- self.assertEmpty(q)
-
- session.message_recover(requeue=False)
-
- self.assertEmpty(confirmed)
-
- while len(data):
- msg = None
- for d in data:
- msg = unconfirmed.get(timeout=1)
- self.assertEqual(d, msg.body)
- self.assertEqual(True, msg.content['redelivered'])
- self.assertEmpty(unconfirmed)
- data.remove(msg.body)
- msg.complete(cumulative=False)
- session.message_recover(requeue=False)
-
-
- def test_recover_requeue(self):
- """
- Test requeing on recovery
- """
- session = self.session
- session.queue_declare(queue="test-requeue", exclusive=True, auto_delete=True)
-
- self.subscribe(queue="test-requeue", destination="consumer_tag", confirm_mode=1)
- queue = session.incoming("consumer_tag")
-
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="One"))
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="Two"))
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="Three"))
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="Four"))
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="Five"))
-
- msg1 = queue.get(timeout=1)
- msg2 = queue.get(timeout=1)
- msg3 = queue.get(timeout=1)
- msg4 = queue.get(timeout=1)
- msg5 = queue.get(timeout=1)
-
- self.assertEqual("One", msg1.content.body)
- self.assertEqual("Two", msg2.content.body)
- self.assertEqual("Three", msg3.content.body)
- self.assertEqual("Four", msg4.content.body)
- self.assertEqual("Five", msg5.content.body)
-
- msg2.complete(cumulative=True) #One and Two
- msg4.complete(cumulative=False) #Four
-
- session.message_cancel(destination="consumer_tag")
-
- #publish a new message
- session.message_transfer(content=Content(properties={'routing_key' : "test-requeue"}, body="Six"))
- #requeue unacked messages (Three and Five)
- session.message_recover(requeue=True)
-
- self.subscribe(queue="test-requeue", destination="consumer_tag")
- queue2 = session.incoming("consumer_tag")
-
- msg3b = queue2.get(timeout=1)
- msg5b = queue2.get(timeout=1)
-
- self.assertEqual("Three", msg3b.content.body)
- self.assertEqual("Five", msg5b.content.body)
-
- self.assertEqual(True, msg3b.content['redelivered'])
- self.assertEqual(True, msg5b.content['redelivered'])
-
- self.assertEqual("Six", queue2.get(timeout=1).content.body)
-
- try:
- extra = queue2.get(timeout=1)
- self.fail("Got unexpected message in second queue: " + extra.content.body)
- except Empty: None
- try:
- extra = queue.get(timeout=1)
- self.fail("Got unexpected message in original queue: " + extra.content.body)
- except Empty: None
-
-
- def test_qos_prefetch_count(self):
- """
- Test that the prefetch count specified is honoured
- """
- #setup: declare queue and subscribe
- session = self.session
- session.queue_declare(queue="test-prefetch-count", exclusive=True, auto_delete=True)
- subscription = self.subscribe(queue="test-prefetch-count", destination="consumer_tag", confirm_mode=1)
- queue = session.incoming("consumer_tag")
-
- #set prefetch to 5:
- session.message_qos(prefetch_count=5)
-
- #publish 10 messages:
- for i in range(1, 11):
- session.message_transfer(content=Content(properties={'routing_key' : "test-prefetch-count"}, body="Message %d" % i))
-
- #only 5 messages should have been delivered:
- for i in range(1, 6):
- msg = queue.get(timeout=1)
- self.assertEqual("Message %d" % i, msg.body)
- try:
- extra = queue.get(timeout=1)
- self.fail("Got unexpected 6th message in original queue: " + extra.content.body)
- except Empty: None
-
- #ack messages and check that the next set arrive ok:
- msg.complete()
-
- for i in range(6, 11):
- msg = queue.get(timeout=1)
- self.assertEqual("Message %d" % i, msg.body)
-
- msg.complete()
-
- try:
- extra = queue.get(timeout=1)
- self.fail("Got unexpected 11th message in original queue: " + extra.content.body)
- except Empty: None
-
-
-
- def test_qos_prefetch_size(self):
- """
- Test that the prefetch size specified is honoured
- """
- #setup: declare queue and subscribe
- session = self.session
- session.queue_declare(queue="test-prefetch-size", exclusive=True, auto_delete=True)
- subscription = self.subscribe(queue="test-prefetch-size", destination="consumer_tag", confirm_mode=1)
- queue = session.incoming("consumer_tag")
-
- #set prefetch to 50 bytes (each message is 9 or 10 bytes):
- session.message_qos(prefetch_size=50)
-
- #publish 10 messages:
- for i in range(1, 11):
- session.message_transfer(content=Content(properties={'routing_key' : "test-prefetch-size"}, body="Message %d" % i))
-
- #only 5 messages should have been delivered (i.e. 45 bytes worth):
- for i in range(1, 6):
- msg = queue.get(timeout=1)
- self.assertEqual("Message %d" % i, msg.body)
-
- try:
- extra = queue.get(timeout=1)
- self.fail("Got unexpected 6th message in original queue: " + extra.content.body)
- except Empty: None
-
- #ack messages and check that the next set arrive ok:
- msg.complete()
-
- for i in range(6, 11):
- msg = queue.get(timeout=1)
- self.assertEqual("Message %d" % i, msg.body)
-
- msg.complete()
-
- try:
- extra = queue.get(timeout=1)
- self.fail("Got unexpected 11th message in original queue: " + extra.content.body)
- except Empty: None
-
- #make sure that a single oversized message still gets delivered
- large = "abcdefghijklmnopqrstuvwxyz"
- large = large + "-" + large;
- session.message_transfer(content=Content(properties={'routing_key' : "test-prefetch-size"}, body=large))
- msg = queue.get(timeout=1)
- self.assertEqual(large, msg.body)
-
def test_reject(self):
session = self.session
session.queue_declare(queue = "q", exclusive=True, auto_delete=True, alternate_exchange="amq.fanout")
@@ -972,20 +779,6 @@
#ensure there are no other messages
self.assertEmpty(queueC)
- def test_no_size(self):
- self.queue_declare(queue = "q", exclusive=True, auto_delete=True)
-
- ssn = self.session
- ssn.message_transfer(content=SizelessContent(properties={'routing_key' : "q"}, body="message-body"))
-
- ssn.message_subscribe(queue = "q", destination="d", confirm_mode = 0)
- ssn.message_flow(unit = ssn.credit_unit.message, value = 0xFFFFFFFF, destination = "d")
- ssn.message_flow(unit = ssn.credit_unit.byte, value = 0xFFFFFFFF, destination = "d")
-
- queue = session.incoming("d")
- msg = queue.get(timeout = 3)
- self.assertEquals("message-body", msg.body)
-
def test_empty_body(self):
session = self.session
session.queue_declare(queue="xyz", exclusive=True, auto_delete=True)