From 14e411f0f8fbbd10aa8bf08e8926332265e04b1c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 29 Jul 2014 12:56:40 +0000 Subject: QPID-5888: Fix test to ignore occasional TransactionAborted failures on connection.close. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614331 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ha_tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index 87d5c2a72d..dfb65318a9 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -1428,7 +1428,8 @@ class TransactionTests(HaBrokerTest): for b in cluster: self.assert_simple_rollback_outcome(b, tx_queues) self.assertRaises(qm.TransactionAborted, tx.sync) self.assertRaises(qm.TransactionAborted, tx.commit) - tx.connection.close() + try: tx.connection.close() + except qm.TransactionAborted: pass # Occasionally get exception on close. for b in cluster: self.assert_simple_rollback_outcome(b, tx_queues) finally: l.restore() -- cgit v1.2.1