Some fixes and tests for bugs uncovered during testing of persistence.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@476108 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 43 insertions, 7 deletions

diff --git a/qpid/python/qpid/testlib.py b/qpid/python/qpid/testlib.py
index f7a34294be..d35c38e4ad 100644
--- a/qpid/python/qpid/testlib.py
+++ b/qpid/python/qpid/testlib.py
@@ -225,13 +225,13 @@ class TestBase(unittest.TestCase):
         self.assertPublishGet(self.consume(queue), exchange, routing_key, properties)
 
     def assertChannelException(self, expectedCode, message): 
-        self.assertEqual(message.method.klass.name, "channel")
-        self.assertEqual(message.method.name, "close")
-        self.assertEqual(message.reply_code, expectedCode)
+        self.assertEqual("channel", message.method.klass.name)
+        self.assertEqual("close", message.method.name)
+        self.assertEqual(expectedCode, message.reply_code)
 
 
     def assertConnectionException(self, expectedCode, message): 
-        self.assertEqual(message.method.klass.name, "connection")
-        self.assertEqual(message.method.name, "close")
-        self.assertEqual(message.reply_code, expectedCode)
+        self.assertEqual("connection", message.method.klass.name)
+        self.assertEqual("close", message.method.name)
+        self.assertEqual(expectedCode, message.reply_code)
 
diff --git a/qpid/python/tests/tx.py b/qpid/python/tests/tx.py
index e8d0e99628..054fb8d8b7 100644
--- a/qpid/python/tests/tx.py
+++ b/qpid/python/tests/tx.py
@@ -55,6 +55,42 @@ class TxTests(TestBase):
         channel.basic_ack(delivery_tag=0, multiple=True)
         channel.tx_commit()
 
+    def test_auto_rollback(self):
+        """
+        Test that a channel closed with an open transaction is effectively rolled back
+        """
+        channel = self.channel
+        queue_a, queue_b, queue_c = self.perform_txn_work(channel, "tx-autorollback-a", "tx-autorollback-b", "tx-autorollback-c")
+
+        for q in [queue_a, queue_b, queue_c]:
+            try:
+                extra = q.get(timeout=1)
+                self.fail("Got unexpected message: " + extra.content.body)
+            except Empty: None
+
+        channel.tx_rollback()
+
+        #check results
+        for i in range(1, 5):
+            msg = queue_a.get(timeout=1)
+            self.assertEqual("Message %d" % i, msg.content.body)
+
+        msg = queue_b.get(timeout=1)
+        self.assertEqual("Message 6", msg.content.body)
+
+        msg = queue_c.get(timeout=1)
+        self.assertEqual("Message 7", msg.content.body)
+
+        for q in [queue_a, queue_b, queue_c]:
+            try:
+                extra = q.get(timeout=1)
+                self.fail("Got unexpected message: " + extra.content.body)
+            except Empty: None
+
+        #cleanup
+        channel.basic_ack(delivery_tag=0, multiple=True)
+        channel.tx_commit()
+
     def test_rollback(self):
         """
         Test that rolled back publishes are not delivered and rolled back acks are re-delivered
@@ -90,7 +126,7 @@ class TxTests(TestBase):
         #cleanup
         channel.basic_ack(delivery_tag=0, multiple=True)
         channel.tx_commit()
-        
+
     def perform_txn_work(self, channel, name_a, name_b, name_c):
         """
         Utility method that does some setup and some work under a transaction. Used for testing both