diff options
| author | Alan Conway <aconway@apache.org> | 2010-01-06 17:02:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-01-06 17:02:11 +0000 |
| commit | 77ed948d1993e9ee96d9423137038a95ef7b1b1d (patch) | |
| tree | fba812cfb1282c398382d01815f069418e1daabf | |
| parent | 4aeeb47e405771fc081f29f5fc3ec28aa9ffc569 (diff) | |
| download | qpid-python-77ed948d1993e9ee96d9423137038a95ef7b1b1d.tar.gz | |
Minor cluster test fixes.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@896540 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 4 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/run_cluster_tests | 1 | ||||
| -rw-r--r-- | qpid/python/qpid/brokertest.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 089d42fd91..27df63a472 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -185,7 +185,7 @@ class StoreTests(BrokerTest): 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 @@ class StoreTests(BrokerTest): 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) diff --git a/qpid/cpp/src/tests/run_cluster_tests b/qpid/cpp/src/tests/run_cluster_tests index 6064f28751..1b8715367e 100755 --- a/qpid/cpp/src/tests/run_cluster_tests +++ b/qpid/cpp/src/tests/run_cluster_tests @@ -35,4 +35,3 @@ CLUSTER_TESTS=${CLUSTER_TESTS:-$*} with_ais_group $QPID_PYTHON_TEST -DOUTDIR=$OUTDIR -m cluster_tests $CLUSTER_TESTS_IGNORE $CLUSTER_TESTS || exit 1 rm -rf $OUTDIR -#exit 0 diff --git a/qpid/python/qpid/brokertest.py b/qpid/python/qpid/brokertest.py index 9ace762465..1a4f73a01f 100644 --- a/qpid/python/qpid/brokertest.py +++ b/qpid/python/qpid/brokertest.py @@ -295,8 +295,8 @@ class BrokerTest(TestCase): 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") |