Move tests to top directory

29 files changed, 16 insertions, 16 deletions

diff --git a/waitress/tests/__init__.py b/tests/__init__.py
index b711d36..b711d36 100644
--- a/waitress/tests/__init__.py
+++ b/tests/__init__.py
diff --git a/waitress/tests/fixtureapps/__init__.py b/tests/fixtureapps/__init__.py
index f215a2b..f215a2b 100644
--- a/waitress/tests/fixtureapps/__init__.py
+++ b/tests/fixtureapps/__init__.py
diff --git a/waitress/tests/fixtureapps/badcl.py b/tests/fixtureapps/badcl.py
index 24067de..24067de 100644
--- a/waitress/tests/fixtureapps/badcl.py
+++ b/tests/fixtureapps/badcl.py
diff --git a/waitress/tests/fixtureapps/echo.py b/tests/fixtureapps/echo.py
index 813bdac..813bdac 100644
--- a/waitress/tests/fixtureapps/echo.py
+++ b/tests/fixtureapps/echo.py
diff --git a/waitress/tests/fixtureapps/error.py b/tests/fixtureapps/error.py
index 5afb1c5..5afb1c5 100644
--- a/waitress/tests/fixtureapps/error.py
+++ b/tests/fixtureapps/error.py
diff --git a/waitress/tests/fixtureapps/filewrapper.py b/tests/fixtureapps/filewrapper.py
index 63df5a6..63df5a6 100644
--- a/waitress/tests/fixtureapps/filewrapper.py
+++ b/tests/fixtureapps/filewrapper.py
diff --git a/waitress/tests/fixtureapps/getline.py b/tests/fixtureapps/getline.py
index 5e0ad3a..5e0ad3a 100644
--- a/waitress/tests/fixtureapps/getline.py
+++ b/tests/fixtureapps/getline.py
diff --git a/waitress/tests/fixtureapps/groundhog1.jpg b/tests/fixtureapps/groundhog1.jpg
index 90f610e..90f610e 100644
--- a/waitress/tests/fixtureapps/groundhog1.jpg
+++ b/tests/fixtureapps/groundhog1.jpg
diff --git a/waitress/tests/fixtureapps/nocl.py b/tests/fixtureapps/nocl.py
index f82bba0..f82bba0 100644
--- a/waitress/tests/fixtureapps/nocl.py
+++ b/tests/fixtureapps/nocl.py
diff --git a/waitress/tests/fixtureapps/runner.py b/tests/fixtureapps/runner.py
index 1d66ad1..1d66ad1 100644
--- a/waitress/tests/fixtureapps/runner.py
+++ b/tests/fixtureapps/runner.py
diff --git a/waitress/tests/fixtureapps/sleepy.py b/tests/fixtureapps/sleepy.py
index 2d171d8..2d171d8 100644
--- a/waitress/tests/fixtureapps/sleepy.py
+++ b/tests/fixtureapps/sleepy.py
diff --git a/waitress/tests/fixtureapps/toolarge.py b/tests/fixtureapps/toolarge.py
index a0f36d2..a0f36d2 100644
--- a/waitress/tests/fixtureapps/toolarge.py
+++ b/tests/fixtureapps/toolarge.py
diff --git a/waitress/tests/fixtureapps/writecb.py b/tests/fixtureapps/writecb.py
index e1d2792..e1d2792 100644
--- a/waitress/tests/fixtureapps/writecb.py
+++ b/tests/fixtureapps/writecb.py
diff --git a/waitress/tests/test_adjustments.py b/tests/test_adjustments.py
index 303c1aa..303c1aa 100644
--- a/waitress/tests/test_adjustments.py
+++ b/tests/test_adjustments.py
diff --git a/waitress/tests/test_buffers.py b/tests/test_buffers.py
index a1330ac..a1330ac 100644
--- a/waitress/tests/test_buffers.py
+++ b/tests/test_buffers.py
diff --git a/waitress/tests/test_channel.py b/tests/test_channel.py
index 14ef5a0..14ef5a0 100644
--- a/waitress/tests/test_channel.py
+++ b/tests/test_channel.py
diff --git a/waitress/tests/test_compat.py b/tests/test_compat.py
index 37c2193..37c2193 100644
--- a/waitress/tests/test_compat.py
+++ b/tests/test_compat.py
diff --git a/waitress/tests/test_functional.py b/tests/test_functional.py
index 8f4b262..4b60676 100644
--- a/waitress/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -126,7 +126,7 @@ class SleepyThreadTests(TcpTests, unittest.TestCase):
     # test that sleepy thread doesnt block other requests
 
     def setUp(self):
-        from waitress.tests.fixtureapps import sleepy
+        from tests.fixtureapps import sleepy
 
         self.start_subprocess(sleepy.app)
 
@@ -159,7 +159,7 @@ class SleepyThreadTests(TcpTests, unittest.TestCase):
 
 class EchoTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import echo
+        from tests.fixtureapps import echo
 
         self.start_subprocess(
             echo.app,
@@ -173,7 +173,7 @@ class EchoTests(object):
         self.stop_subprocess()
 
     def _read_echo(self, fp):
-        from waitress.tests.fixtureapps import echo
+        from tests.fixtureapps import echo
 
         line, headers, body = read_http(fp)
         return line, headers, echo.parse_response(body)
@@ -479,7 +479,7 @@ class EchoTests(object):
 
 class PipeliningTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import echo
+        from tests.fixtureapps import echo
 
         self.start_subprocess(echo.app_body_only)
 
@@ -521,7 +521,7 @@ class PipeliningTests(object):
 
 class ExpectContinueTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import echo
+        from tests.fixtureapps import echo
 
         self.start_subprocess(echo.app_body_only)
 
@@ -560,7 +560,7 @@ class ExpectContinueTests(object):
 
 class BadContentLengthTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import badcl
+        from tests.fixtureapps import badcl
 
         self.start_subprocess(badcl.app)
 
@@ -626,7 +626,7 @@ class BadContentLengthTests(object):
 
 class NoContentLengthTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import nocl
+        from tests.fixtureapps import nocl
 
         self.start_subprocess(nocl.app)
 
@@ -763,7 +763,7 @@ class NoContentLengthTests(object):
 
 class WriteCallbackTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import writecb
+        from tests.fixtureapps import writecb
 
         self.start_subprocess(writecb.app)
 
@@ -867,7 +867,7 @@ class TooLargeTests(object):
     toobig = 1050
 
     def setUp(self):
-        from waitress.tests.fixtureapps import toolarge
+        from tests.fixtureapps import toolarge
 
         self.start_subprocess(
             toolarge.app, max_request_header_size=1000, max_request_body_size=1000
@@ -1059,7 +1059,7 @@ class TooLargeTests(object):
 
 class InternalServerErrorTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import error
+        from tests.fixtureapps import error
 
         self.start_subprocess(error.app, expose_tracebacks=True)
 
@@ -1209,7 +1209,7 @@ class InternalServerErrorTests(object):
 
 class FileWrapperTests(object):
     def setUp(self):
-        from waitress.tests.fixtureapps import filewrapper
+        from tests.fixtureapps import filewrapper
 
         self.start_subprocess(filewrapper.app)
 
diff --git a/waitress/tests/test_init.py b/tests/test_init.py
index f9b91d7..f9b91d7 100644
--- a/waitress/tests/test_init.py
+++ b/tests/test_init.py
diff --git a/waitress/tests/test_parser.py b/tests/test_parser.py
index 91837c7..91837c7 100644
--- a/waitress/tests/test_parser.py
+++ b/tests/test_parser.py
diff --git a/waitress/tests/test_proxy_headers.py b/tests/test_proxy_headers.py
index 15b4a08..15b4a08 100644
--- a/waitress/tests/test_proxy_headers.py
+++ b/tests/test_proxy_headers.py
diff --git a/waitress/tests/test_receiver.py b/tests/test_receiver.py
index b4910bb..b4910bb 100644
--- a/waitress/tests/test_receiver.py
+++ b/tests/test_receiver.py
diff --git a/waitress/tests/test_regression.py b/tests/test_regression.py
index 3c4c6c2..3c4c6c2 100644
--- a/waitress/tests/test_regression.py
+++ b/tests/test_regression.py
diff --git a/waitress/tests/test_runner.py b/tests/test_runner.py
index 127757e..e53018b 100644
--- a/waitress/tests/test_runner.py
+++ b/tests/test_runner.py
@@ -115,11 +115,11 @@ class Test_run(unittest.TestCase):
 
     def test_bad_app_object(self):
         self.match_output(
-            ["waitress.tests.fixtureapps.runner:a"], 1, "^Error: Bad object name 'a'"
+            ["tests.fixtureapps.runner:a"], 1, "^Error: Bad object name 'a'"
         )
 
     def test_simple_call(self):
-        import waitress.tests.fixtureapps.runner as _apps
+        import tests.fixtureapps.runner as _apps
 
         def check_server(app, **kw):
             self.assertIs(app, _apps.app)
@@ -128,12 +128,12 @@ class Test_run(unittest.TestCase):
         argv = [
             "waitress-serve",
             "--port=80",
-            "waitress.tests.fixtureapps.runner:app",
+            "tests.fixtureapps.runner:app",
         ]
         self.assertEqual(runner.run(argv=argv, _serve=check_server), 0)
 
     def test_returned_app(self):
-        import waitress.tests.fixtureapps.runner as _apps
+        import tests.fixtureapps.runner as _apps
 
         def check_server(app, **kw):
             self.assertIs(app, _apps.app)
@@ -143,7 +143,7 @@ class Test_run(unittest.TestCase):
             "waitress-serve",
             "--port=80",
             "--call",
-            "waitress.tests.fixtureapps.runner:returns_app",
+            "tests.fixtureapps.runner:returns_app",
         ]
         self.assertEqual(runner.run(argv=argv, _serve=check_server), 0)
 
diff --git a/waitress/tests/test_server.py b/tests/test_server.py
index 9134fb8..9134fb8 100644
--- a/waitress/tests/test_server.py
+++ b/tests/test_server.py
diff --git a/waitress/tests/test_task.py b/tests/test_task.py
index 1a86245..1a86245 100644
--- a/waitress/tests/test_task.py
+++ b/tests/test_task.py
diff --git a/waitress/tests/test_trigger.py b/tests/test_trigger.py
index af740f6..af740f6 100644
--- a/waitress/tests/test_trigger.py
+++ b/tests/test_trigger.py
diff --git a/waitress/tests/test_utilities.py b/tests/test_utilities.py
index 15cd24f..15cd24f 100644
--- a/waitress/tests/test_utilities.py
+++ b/tests/test_utilities.py
diff --git a/waitress/tests/test_wasyncore.py b/tests/test_wasyncore.py
index 9c23509..9c23509 100644
--- a/waitress/tests/test_wasyncore.py
+++ b/tests/test_wasyncore.py