diff options
| author | Alan Conway <aconway@apache.org> | 2015-05-19 23:27:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2015-05-19 23:27:36 +0000 |
| commit | 5227738b402e7a9dc5d8ae56fec4a1eb21660e6b (patch) | |
| tree | 4a4d11e08cd8a06c3d138bb06036ea9d4b3efbda | |
| parent | ef6d477272d66bbd7d7bd68eb0a89af81e9d42a8 (diff) | |
| download | qpid-python-5227738b402e7a9dc5d8ae56fec4a1eb21660e6b.tar.gz | |
NO-JIRA: Fix test bugs in ha_tests and interop_test
Race conditions in ha_tests.
Typo in skip logic for interop_test when recent proton not available.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1680422 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/ha_tests.py | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/interop_tests.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index d0d713e34a..2ee2e291e2 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -674,6 +674,7 @@ acl deny all all s.acknowledge(msg, qm.Disposition(qm.REJECTED)) # Reject the message self.assertEqual("bar", altq.fetch(timeout=0).content) s.acknowledge() + s.sync() # Make sure backups are caught-up. c.close() # Sanity check: alternate exchanges on original broker @@ -885,6 +886,7 @@ acl deny all all qs = ["q%s"%i for i in xrange(10)] a = cluster[0].agent a.addQueue("q") + cluster[1].wait_backup("q") cluster.kill(0) cluster[1].promote() cluster[1].wait_status("active") diff --git a/qpid/cpp/src/tests/interop_tests.py b/qpid/cpp/src/tests/interop_tests.py index d5533ead21..f76b9f634b 100755 --- a/qpid/cpp/src/tests/interop_tests.py +++ b/qpid/cpp/src/tests/interop_tests.py @@ -195,7 +195,7 @@ if __name__ == "__main__": if not BrokerTest.amqp_tx_supported: BrokerTest.amqp_tx_warning() print "Skipping interop_tests" - exit(0) + sys.exit(0) outdir = "interop_tests.tmp" shutil.rmtree(outdir, True) cmd = ["qpid-python-test", "-m", "interop_tests", "-DOUTDIR=%s"%outdir] + sys.argv[1:] |