Author: aconway
Date: Fri Jan 21 17:47:52 2011
New Revision: 1061933
URL: http://svn.apache.org/viewvc?rev=1061933&view=rev
Log:
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.
Added:
qpid/trunk/qpid/cpp/src/tests/brokertest.py (contents, props changed)
- copied, changed from r1061932, qpid/trunk/qpid/python/qpid/brokertest.py
Removed:
qpid/trunk/qpid/python/qpid/brokertest.py
Modified:
qpid/trunk/qpid/cpp/src/tests/cli_tests.py
qpid/trunk/qpid/cpp/src/tests/cluster.mk
qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
qpid/trunk/qpid/cpp/src/tests/store.py (contents, props changed)
Copied: qpid/trunk/qpid/cpp/src/tests/brokertest.py (from r1061932,
qpid/trunk/qpid/python/qpid/brokertest.py)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?p2=qpid/trunk/qpid/cpp/src/tests/brokertest.py&p1=qpid/trunk/qpid/python/qpid/brokertest.py&r1=1061932&r2=1061933&rev=1061933&view=diff
==============================================================================
(empty)
Propchange: qpid/trunk/qpid/cpp/src/tests/brokertest.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/trunk/qpid/cpp/src/tests/cli_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cli_tests.py?rev=1061933&r1=1061932&r2=1061933&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cli_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/cli_tests.py Fri Jan 21 17:47:52 2011
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/cluster.mk
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=1061933&r1=1061932&r2=1061933&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster.mk Fri Jan 21 17:47:52 2011
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py?rev=1061933&r1=1061932&r2=1061933&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_tests.py Fri Jan 21 17:47:52 2011
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/store.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/store.py?rev=1061933&r1=1061932&r2=1061933&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/store.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/store.py Fri Jan 21 17:47:52 2011
@@ -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
Propchange: qpid/trunk/qpid/cpp/src/tests/store.py
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
