summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/testlib.py
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-12-02 19:00:11 +0000
committerAlan Conway <aconway@apache.org>2009-12-02 19:00:11 +0000
commit59ab4a4ecaf9b6a820a0cf2e60a70add8e0bf31b (patch)
treed80c1d37e6554c30d7d25fb2ed425c0bf8634274 /qpid/cpp/src/tests/testlib.py
parent7eaea4e705f4a0e13c71c4124102b7ae0d93c1c8 (diff)
downloadqpid-python-59ab4a4ecaf9b6a820a0cf2e60a70add8e0bf31b.tar.gz
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@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/testlib.py')
-rw-r--r--qpid/cpp/src/tests/testlib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/testlib.py b/qpid/cpp/src/tests/testlib.py
index 1402ba792c..fe57a84a81 100644
--- a/qpid/cpp/src/tests/testlib.py
+++ b/qpid/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
+