From 9bd37c771305c1744470bb24f5bf515ce8af5520 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 2 Dec 2009 19:00:11 +0000 Subject: Run cluster tests under cmake. Various other test fixes. - Env vars to abstract different library location under cmake/automake. - More consistent use of env vars test_env.sh in test scripts. - Fix replication/replicating_exchange mismatch. - Add --no-module-dir to prevent accidentally loading modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@886259 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/testlib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/tests/testlib.py') diff --git a/cpp/src/tests/testlib.py b/cpp/src/tests/testlib.py index 1402ba792c..fe57a84a81 100644 --- a/cpp/src/tests/testlib.py +++ b/cpp/src/tests/testlib.py @@ -118,7 +118,7 @@ class TestBase(unittest.TestCase): def stopBroker(self, nodeTuple, ignoreFailures = False): """Stop a broker using qpidd -q""" try: - ret = os.spawnl(os.P_WAIT, self._qpiddExec, self._qpiddExec, "--port=%d" % nodeTuple[self.PORT], "--quit") + ret = os.spawnl(os.P_WAIT, self._qpiddExec, self._qpiddExec, "--port=%d" % nodeTuple[self.PORT], "--quit", "--no-module-dir") if ret != 0: raise Exception("stopBroker(): port=%d: qpidd -q returned %d" % (nodeTuple[self.PORT], ret)) try: @@ -763,4 +763,4 @@ class TestBaseCluster(TestBase): msgList = TestBaseCluster.TestHelper.sendMsgs(self, "", numMsgs, nodeNumber, msgSize, wait) for ml in self._txMsgs.itervalues(): ml.extend(msgList) - \ No newline at end of file + -- cgit v1.2.1