You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/01/06 18:02:14 UTC
svn commit: r896540 - in /qpid/trunk/qpid: cpp/src/tests/cluster_tests.py
cpp/src/tests/run_cluster_tests python/qpid/brokertest.py
Author: aconway
Date: Wed Jan 6 17:02:11 2010
New Revision: 896540
URL: http://svn.apache.org/viewvc?rev=896540&view=rev
Log:
Minor cluster test fixes.
Modified:
qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
qpid/trunk/qpid/python/qpid/brokertest.py
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py?rev=896540&r1=896539&r2=896540&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_tests.py Wed Jan 6 17:02:11 2010
@@ -185,7 +185,7 @@
self.assertEqual(c.get_message("q").content, "2")
# Shut down the entire cluster cleanly and bring it back up
a.send_message("q", Message("3", durable=True))
- qpid_cluster.main(["qpid-cluster", "-kf", a.host_port()])
+ self.assertEqual(0, qpid_cluster.main(["qpid-cluster", "-kf", a.host_port()]))
a = cluster.start("a", wait=False)
b = cluster.start("b", wait=False)
c = cluster.start("c", wait=True)
@@ -203,7 +203,7 @@
b.kill()
self.assertEqual(c.get_message("q").content, "4")
c.send_message("q", Message("clean", durable=True))
- qpid_cluster.main(["qpid-cluster", "-kf", c.host_port()])
+ self.assertEqual(0, qpid_cluster.main(["qpid-cluster", "-kf", c.host_port()]))
a = cluster.start("a", wait=False)
b = cluster.start("b", wait=False)
c = cluster.start("c", wait=True)
Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_tests?rev=896540&r1=896539&r2=896540&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_tests Wed Jan 6 17:02:11 2010
@@ -35,4 +35,3 @@
with_ais_group $QPID_PYTHON_TEST -DOUTDIR=$OUTDIR -m cluster_tests $CLUSTER_TESTS_IGNORE $CLUSTER_TESTS || exit 1
rm -rf $OUTDIR
-#exit 0
Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=896540&r1=896539&r2=896540&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Wed Jan 6 17:02:11 2010
@@ -295,8 +295,8 @@
qpidd_exec = checkenv("QPIDD_EXEC")
cluster_lib = os.getenv("CLUSTER_LIB")
xml_lib = os.getenv("XML_LIB")
- qpidConfig_exec = os.getenv("QPID_CONFIG_EXEC")
- qpidRoute_exec = os.getenv("QPID_ROUTE_EXEC")
+ qpid_config_exec = os.getenv("QPID_CONFIG_EXEC")
+ qpid_route_exec = os.getenv("QPID_ROUTE_EXEC")
receiver_exec = os.getenv("RECEIVER_EXEC")
sender_exec = os.getenv("SENDER_EXEC")
store_lib = os.getenv("STORE_LIB")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org