Author: aconway
Date: Tue May 19 23:27:36 2015
New Revision: 1680422
URL: http://svn.apache.org/r1680422
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/tests/ha_tests.py
qpid/trunk/qpid/cpp/src/tests/interop_tests.py
Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1680422&r1=1680421&r2=1680422&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Tue May 19 23:27:36 2015
@@ -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")
Modified: qpid/trunk/qpid/cpp/src/tests/interop_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/interop_tests.py?rev=1680422&r1=1680421&r2=1680422&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/interop_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/interop_tests.py Tue May 19 23:27:36 2015
@@ -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:]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
