diff options
| author | Alan Conway <aconway@apache.org> | 2011-01-21 17:47:52 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-01-21 17:47:52 +0000 |
| commit | 357b08088933b680e0b31aa9bbc0d1cd4c4df34c (patch) | |
| tree | f479d789a3d91ca7f1ca10ad617827ea1f191dc0 /qpid | |
| parent | c386d887cafdd5e56277fed0e6c6805d30513147 (diff) | |
| download | qpid-python-357b08088933b680e0b31aa9bbc0d1cd4c4df34c.tar.gz | |
Move brokertest.py from qpid/python to qpid/cpp.
brokertest.py is a framework for tests using the C++ broker, so it
belongs in the cpp tree rather than the python tree.
It is installed to libexec/qpid/tests/ so it can be used from
an installation of qpid cpp.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1061933 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py (renamed from qpid/python/qpid/brokertest.py) | 0 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/cli_tests.py | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/cluster.mk | 3 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | qpid/cpp/src/tests/store.py | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/qpid/python/qpid/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 98f58ebfdd..98f58ebfdd 100644 --- a/qpid/python/qpid/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py diff --git a/qpid/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py index 4a7314a85c..deef03279d 100755 --- a/qpid/cpp/src/tests/cli_tests.py +++ b/qpid/cpp/src/tests/cli_tests.py @@ -22,7 +22,7 @@ import sys import os import imp from qpid.testlib import TestBase010 -# from qpid.brokertest import import_script, checkenv +# from brokertest import import_script, checkenv from qpid.datatypes import Message from qpid.queue import Empty from time import sleep diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index f6cfd7a6ca..c9e6d79ee7 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -44,6 +44,7 @@ EXTRA_DIST += \ run_cluster_tests \ run_long_cluster_tests \ testlib.py \ + brokertest.py \ cluster_tests.py \ cluster_test_logs.py \ long_cluster_tests.py \ @@ -93,7 +94,7 @@ cluster_test_SOURCES = \ cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework -qpidtest_SCRIPTS += run_cluster_tests cluster_tests.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail +qpidtest_SCRIPTS += run_cluster_tests brokertest.py cluster_tests.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail qpidtest_SCRIPTS += $(CLUSTER_TEST_SCRIPTS_LIST) endif diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 27010c17f7..992aaa6b9b 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -20,7 +20,7 @@ import os, signal, sys, time, imp, re, subprocess, glob, cluster_test_logs from qpid import datatypes, messaging -from qpid.brokertest import * +from brokertest import * from qpid.harness import Skipped from qpid.messaging import Message, Empty from threading import Thread, Lock diff --git a/qpid/cpp/src/tests/store.py b/qpid/cpp/src/tests/store.py index eb4cd4785e..77e8a78e5d 100644..100755 --- a/qpid/cpp/src/tests/store.py +++ b/qpid/cpp/src/tests/store.py @@ -19,7 +19,7 @@ # import errno, os, time -from qpid.brokertest import * +from brokertest import * from qpid import compat, session from qpid.util import connect from qpid.connection import Connection |