diff options
| -rw-r--r-- | qpid/cpp/src/tests/cluster.mk | 3 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 4 | ||||
| -rw-r--r-- | qpid/python/qpid/brokertest.py (renamed from qpid/cpp/src/tests/brokertest.py) | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index c5188e292d..961d65f319 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -55,7 +55,6 @@ EXTRA_DIST += \ run_cluster_tests \ run_long_cluster_tests \ testlib.py \ - brokertest.py \ cluster_tests.py \ long_cluster_tests.py \ cluster_tests.fail @@ -80,6 +79,6 @@ cluster_test_SOURCES = \ cluster_test_LDADD=$(lib_client) $(lib_broker) -lboost_unit_test_framework -qpidtest_SCRIPTS += run_cluster_tests cluster_tests.py run_long_cluster_tests long_cluster_tests.py testlib.py brokertest.py cluster_tests.fail +qpidtest_SCRIPTS += run_cluster_tests cluster_tests.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail endif diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 07050c922f..75e51b6d57 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -19,11 +19,11 @@ # import os, signal, sys, time -from threading import Thread -from brokertest import * from qpid import datatypes, messaging +from qpid.brokertest import * from qpid.harness import Skipped from qpid.messaging import Message +from threading import Thread class ClusterTests(BrokerTest): diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/python/qpid/brokertest.py index d70990bfae..d70990bfae 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/python/qpid/brokertest.py |