moved protocol tests from qpid/python to qpid/tests

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906961 13f79535-47bb-0310-9956-ffa450edef68

29 files changed, 29 insertions, 19 deletions

diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index 51c808a6c9..e367004a71 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -26,4 +26,4 @@ QPID_PORT=${QPID_PORT:-5672}
 PYTHON_TESTS=${PYTHON_TESTS:-$*}
 FAILING=${FAILING:-/dev/null}
 
-python $QPID_PYTHON_TEST -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1
+python $QPID_PYTHON_TEST -m qpid_tests.broker_0_10 -m qpid.tests -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1
diff --git a/cpp/src/tests/run_acl_tests b/cpp/src/tests/run_acl_tests
index 7112f621a1..aff13408ed 100755
--- a/cpp/src/tests/run_acl_tests
+++ b/cpp/src/tests/run_acl_tests
@@ -53,8 +53,6 @@ if test -d ${PYTHON_DIR} ;  then
     cp $srcdir/policy.acl $DATA_DIR
     start_brokers
     echo "Running acl tests using brokers on ports $LOCAL_PORT"
-    PYTHONPATH=$PYTHON_DIR:$srcdir
-    export PYTHONPATH
     $QPID_PYTHON_TEST -b localhost:$LOCAL_PORT -m acl || EXITCODE=1
     stop_brokers || EXITCODE=1
     test_loading_acl_from_absolute_path || EXITCODE=1
diff --git a/cpp/src/tests/test_env.sh.in b/cpp/src/tests/test_env.sh.in
index cf0758e022..0ce7fabe8c 100644
--- a/cpp/src/tests/test_env.sh.in
+++ b/cpp/src/tests/test_env.sh.in
@@ -34,8 +34,10 @@ if [ ! -d $PYTHON_DIR -a -d $top_srcdir/../python ]; then
     export PYTHON_DIR=$top_srcdir/../python
     export QPID_PYTHON_TEST=$PYTHON_DIR/qpid-python-test
 fi
+export QPID_TESTS=$top_srcdir/../tests
+export QPID_TESTS_PY=$QPID_TESTS/src/py
 export PYTHON_COMMANDS=$PYTHON_DIR/commands
-export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$PYTHONPATH
+export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$PYTHONPATH
 export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config
 export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route
 export QPID_CLUSTER_EXEC=$PYTHON_COMMANDS/qpid-cluster
diff --git a/python/Makefile b/python/Makefile
index 2c7f9b8de0..2f2cb784e5 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -31,7 +31,7 @@ else
 AMQP_SPEC_DIR=$(PWD)/$(DATA_DIR)/amqp
 endif
 
-DIRS=qmf qpid mllib models examples tests tests_0-8 tests_0-9 tests_0-10
+DIRS=qmf qpid mllib models examples tests
 SRCS=$(shell find $(DIRS) -name "*.py") qpid_config.py
 BUILD=build
 TARGETS=$(SRCS:%.py=$(BUILD)/%.py)
@@ -79,18 +79,6 @@ install: build
 	install -pm 0644 $(BUILD)/tests/*.* $(PYTHON_LIB)/tests
 	$(PYCC) $(PYTHON_LIB)/tests
 
-	install -d $(PYTHON_LIB)/tests_0-8
-	install -pm 0644 $(BUILD)/tests_0-8/*.* $(PYTHON_LIB)/tests_0-8
-	$(PYCC) $(PYTHON_LIB)/tests_0-8
-
-	install -d $(PYTHON_LIB)/tests_0-9
-	install -pm 0644 $(BUILD)/tests_0-9/*.* $(PYTHON_LIB)/tests_0-9
-	$(PYCC) $(PYTHON_LIB)/tests_0-9
-
-	install -d $(PYTHON_LIB)/tests_0-10
-	install -pm 0644 $(BUILD)/tests_0-10/*.* $(PYTHON_LIB)/tests_0-10
-	$(PYCC) $(PYTHON_LIB)/tests_0-10
-
 	install -d $(EXEC_PREFIX)
 	install -pm 0755 qpid-python-test commands/* $(EXEC_PREFIX)
 
diff --git a/python/qpid-python-test b/python/qpid-python-test
index b569020368..5aedcb68ea 100755
--- a/python/qpid-python-test
+++ b/python/qpid-python-test
@@ -107,7 +107,7 @@ if not includes:
   if opts.modules:
     includes.append("*")
   else:
-    includes.extend(["qpid.tests.*", "tests.*", "tests_0-10.*"])
+    includes.extend(["qpid.tests.*", "tests.*"])
 
 def is_ignored(path):
   for p in excludes:
@@ -512,7 +512,7 @@ class Harness:
 
 modules = opts.modules
 if not modules:
-  modules.extend(["qpid.tests", "tests", "tests_0-8", "tests_0-9", "tests_0-10"])
+  modules.extend(["qpid.tests", "tests"])
 h = Harness()
 for name in modules:
   m = __import__(name, None, None, ["dummy"])
diff --git a/tests/src/py/qpid_tests/__init__.py b/tests/src/py/qpid_tests/__init__.py
new file mode 100644
index 0000000000..7b522f59af
--- /dev/null
+++ b/tests/src/py/qpid_tests/__init__.py
@@ -0,0 +1,22 @@
+# Do not delete - marks this directory as a python package.
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+import broker_0_10, broker_0_9, broker_0_8
diff --git a/python/tests_0-10/__init__.py b/tests/src/py/qpid_tests/broker_0_10/__init__.py
index f9315a6f90..f9315a6f90 100644
--- a/python/tests_0-10/__init__.py
+++ b/tests/src/py/qpid_tests/broker_0_10/__init__.py
diff --git a/python/tests_0-10/alternate_exchange.py b/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
index 4d8617eb8e..4d8617eb8e 100644
--- a/python/tests_0-10/alternate_exchange.py
+++ b/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
diff --git a/python/tests_0-10/broker.py b/tests/src/py/qpid_tests/broker_0_10/broker.py
index 81d723e322..81d723e322 100644
--- a/python/tests_0-10/broker.py
+++ b/tests/src/py/qpid_tests/broker_0_10/broker.py
diff --git a/python/tests_0-10/dtx.py b/tests/src/py/qpid_tests/broker_0_10/dtx.py
index 2823385a3b..2823385a3b 100644
--- a/python/tests_0-10/dtx.py
+++ b/tests/src/py/qpid_tests/broker_0_10/dtx.py
diff --git a/python/tests_0-10/example.py b/tests/src/py/qpid_tests/broker_0_10/example.py
index e36907d501..e36907d501 100644
--- a/python/tests_0-10/example.py
+++ b/tests/src/py/qpid_tests/broker_0_10/example.py
diff --git a/python/tests_0-10/exchange.py b/tests/src/py/qpid_tests/broker_0_10/exchange.py
index 0ac78a4799..0ac78a4799 100644
--- a/python/tests_0-10/exchange.py
+++ b/tests/src/py/qpid_tests/broker_0_10/exchange.py
diff --git a/python/tests_0-10/management.py b/tests/src/py/qpid_tests/broker_0_10/management.py
index 677645fa2c..677645fa2c 100644
--- a/python/tests_0-10/management.py
+++ b/tests/src/py/qpid_tests/broker_0_10/management.py
diff --git a/python/tests_0-10/message.py b/tests/src/py/qpid_tests/broker_0_10/message.py
index e80333a1e6..e80333a1e6 100644
--- a/python/tests_0-10/message.py
+++ b/tests/src/py/qpid_tests/broker_0_10/message.py
diff --git a/python/tests_0-10/persistence.py b/tests/src/py/qpid_tests/broker_0_10/persistence.py
index e9cf9b7caa..e9cf9b7caa 100644
--- a/python/tests_0-10/persistence.py
+++ b/tests/src/py/qpid_tests/broker_0_10/persistence.py
diff --git a/python/tests_0-10/query.py b/tests/src/py/qpid_tests/broker_0_10/query.py
index d57e964982..d57e964982 100644
--- a/python/tests_0-10/query.py
+++ b/tests/src/py/qpid_tests/broker_0_10/query.py
diff --git a/python/tests_0-10/queue.py b/tests/src/py/qpid_tests/broker_0_10/queue.py
index eb38965190..eb38965190 100644
--- a/python/tests_0-10/queue.py
+++ b/tests/src/py/qpid_tests/broker_0_10/queue.py
diff --git a/python/tests_0-10/tx.py b/tests/src/py/qpid_tests/broker_0_10/tx.py
index 8cdc539a08..8cdc539a08 100644
--- a/python/tests_0-10/tx.py
+++ b/tests/src/py/qpid_tests/broker_0_10/tx.py
diff --git a/python/tests_0-8/__init__.py b/tests/src/py/qpid_tests/broker_0_8/__init__.py
index 526f2452f8..526f2452f8 100644
--- a/python/tests_0-8/__init__.py
+++ b/tests/src/py/qpid_tests/broker_0_8/__init__.py
diff --git a/python/tests_0-8/basic.py b/tests/src/py/qpid_tests/broker_0_8/basic.py
index d5837fc19c..d5837fc19c 100644
--- a/python/tests_0-8/basic.py
+++ b/tests/src/py/qpid_tests/broker_0_8/basic.py
diff --git a/python/tests_0-8/broker.py b/tests/src/py/qpid_tests/broker_0_8/broker.py
index 7f3fe7530e..7f3fe7530e 100644
--- a/python/tests_0-8/broker.py
+++ b/tests/src/py/qpid_tests/broker_0_8/broker.py
diff --git a/python/tests_0-8/example.py b/tests/src/py/qpid_tests/broker_0_8/example.py
index d82bad1f61..d82bad1f61 100644
--- a/python/tests_0-8/example.py
+++ b/tests/src/py/qpid_tests/broker_0_8/example.py
diff --git a/python/tests_0-8/exchange.py b/tests/src/py/qpid_tests/broker_0_8/exchange.py
index 56d6fa82e4..56d6fa82e4 100644
--- a/python/tests_0-8/exchange.py
+++ b/tests/src/py/qpid_tests/broker_0_8/exchange.py
diff --git a/python/tests_0-8/queue.py b/tests/src/py/qpid_tests/broker_0_8/queue.py
index b7a41736ab..b7a41736ab 100644
--- a/python/tests_0-8/queue.py
+++ b/tests/src/py/qpid_tests/broker_0_8/queue.py
diff --git a/python/tests_0-8/testlib.py b/tests/src/py/qpid_tests/broker_0_8/testlib.py
index 76f7e964a2..76f7e964a2 100644
--- a/python/tests_0-8/testlib.py
+++ b/tests/src/py/qpid_tests/broker_0_8/testlib.py
diff --git a/python/tests_0-8/tx.py b/tests/src/py/qpid_tests/broker_0_8/tx.py
index 9faddb1110..9faddb1110 100644
--- a/python/tests_0-8/tx.py
+++ b/tests/src/py/qpid_tests/broker_0_8/tx.py
diff --git a/python/tests_0-9/__init__.py b/tests/src/py/qpid_tests/broker_0_9/__init__.py
index d9f2ed7dbb..d9f2ed7dbb 100644
--- a/python/tests_0-9/__init__.py
+++ b/tests/src/py/qpid_tests/broker_0_9/__init__.py
diff --git a/python/tests_0-9/query.py b/tests/src/py/qpid_tests/broker_0_9/query.py
index cb66d079e5..cb66d079e5 100644
--- a/python/tests_0-9/query.py
+++ b/tests/src/py/qpid_tests/broker_0_9/query.py
diff --git a/python/tests_0-9/queue.py b/tests/src/py/qpid_tests/broker_0_9/queue.py
index de1153307c..de1153307c 100644
--- a/python/tests_0-9/queue.py
+++ b/tests/src/py/qpid_tests/broker_0_9/queue.py