diff options
| author | Alan Conway <aconway@apache.org> | 2014-07-29 12:56:40 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-07-29 12:56:40 +0000 |
| commit | 14e411f0f8fbbd10aa8bf08e8926332265e04b1c (patch) | |
| tree | 878129297ad75ae55a832810cb6633da2802ccd6 /qpid/cpp/src/tests | |
| parent | 44c69a63f8429e2f97ced545c9099caaca8cd7a0 (diff) | |
| download | qpid-python-14e411f0f8fbbd10aa8bf08e8926332265e04b1c.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@1614331 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/ha_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
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() |