summaryrefslogtreecommitdiff
path: root/cpp/src/tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2014-07-29 12:56:40 +0000
committerAlan Conway <aconway@apache.org>2014-07-29 12:56:40 +0000
commit2b9bd980678fc07dca4ac1d524a387fbdd7b97d5 (patch)
tree9893a292bc0289f70f780a27df7d680b3c2cb79a /cpp/src/tests
parent6700d95ab46fe45d69f89650c37bd97c52ba656b (diff)
downloadqpid-python-2b9bd980678fc07dca4ac1d524a387fbdd7b97d5.tar.gz
QPID-5888: Fix test to ignore occasional TransactionAborted failures on connection.close.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1614331 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
-rwxr-xr-xcpp/src/tests/ha_tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py
index 87d5c2a72d..dfb65318a9 100755
--- a/cpp/src/tests/ha_tests.py
+++ b/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()