moved tests/*.py underneath qpid/tests/*.py

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

9 files changed, 6 insertions, 24 deletions

diff --git a/python/qpid-python-test b/python/qpid-python-test
index 5aedcb68ea..f7955a4a9d 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.*"])
+    includes.extend(["qpid.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"])
+  modules.extend(["qpid.tests"])
 h = Harness()
 for name in modules:
   m = __import__(name, None, None, ["dummy"])
diff --git a/python/qpid/tests/__init__.py b/python/qpid/tests/__init__.py
index 2f0fcfdf67..039214ca42 100644
--- a/python/qpid/tests/__init__.py
+++ b/python/qpid/tests/__init__.py
@@ -25,4 +25,8 @@ class Test:
   def configure(self, config):
     self.config = config
 
+# API Tests
 import address, framing, mimetype, messaging
+
+# Legacy Tests
+import codec, queue, datatypes, connection, spec010, codec010
diff --git a/python/tests/codec.py b/python/qpid/tests/codec.py
index 9b51b4713c..9b51b4713c 100644
--- a/python/tests/codec.py
+++ b/python/qpid/tests/codec.py
diff --git a/python/tests/codec010.py b/python/qpid/tests/codec010.py
index 787ebc146f..787ebc146f 100644
--- a/python/tests/codec010.py
+++ b/python/qpid/tests/codec010.py
diff --git a/python/tests/connection.py b/python/qpid/tests/connection.py
index 8c00df56e1..8c00df56e1 100644
--- a/python/tests/connection.py
+++ b/python/qpid/tests/connection.py
diff --git a/python/tests/datatypes.py b/python/qpid/tests/datatypes.py
index 00e649d6cf..00e649d6cf 100644
--- a/python/tests/datatypes.py
+++ b/python/qpid/tests/datatypes.py
diff --git a/python/tests/queue.py b/python/qpid/tests/queue.py
index e12354eb43..e12354eb43 100644
--- a/python/tests/queue.py
+++ b/python/qpid/tests/queue.py
diff --git a/python/tests/spec010.py b/python/qpid/tests/spec010.py
index ac04e1ee02..ac04e1ee02 100644
--- a/python/tests/spec010.py
+++ b/python/qpid/tests/spec010.py
diff --git a/python/tests/__init__.py b/python/tests/__init__.py
deleted file mode 100644
index 1e495f3af3..0000000000
--- a/python/tests/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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 codec, queue, datatypes, connection, spec010, codec010