From 6d113a2db092e7c022fb284f88ef4747e9484c44 Mon Sep 17 00:00:00 2001 From: Mark Peek Date: Fri, 20 Mar 2015 08:07:31 -0700 Subject: [PATCH] Move coro_unittest.py into coro/test for use by other tests Fixes #65 --- coro/test/__init__.py | 0 {test => coro/test}/coro_unittest.py | 0 test/test_accept_many.py | 2 +- test/test_aio.py | 2 +- test/test_asn1_python.py | 2 +- test/test_condition_variable.py | 2 +- test/test_ecdsa.py | 2 +- test/test_event_queue.py | 2 +- test/test_in_parallel.py | 2 +- test/test_interrupt.py | 2 +- test/test_isemaphore.py | 2 +- test/test_lio.py | 2 +- test/test_local.py | 2 +- test/test_mutex.py | 2 +- test/test_notify_of_close.py | 2 +- test/test_poller.py | 2 +- test/test_profile.py | 2 +- test/test_readv.py | 2 +- test/test_rw_lock.py | 2 +- test/test_semaphore.py | 2 +- test/test_signal_handler.py | 4 ++-- test/test_socket.py | 2 +- test/test_with_timeout.py | 2 +- test/test_writev.py | 2 +- 24 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 coro/test/__init__.py rename {test => coro/test}/coro_unittest.py (100%) diff --git a/coro/test/__init__.py b/coro/test/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test/coro_unittest.py b/coro/test/coro_unittest.py similarity index 100% rename from test/coro_unittest.py rename to coro/test/coro_unittest.py diff --git a/test/test_accept_many.py b/test/test_accept_many.py index fd1ed8c..53a640e 100644 --- a/test/test_accept_many.py +++ b/test/test_accept_many.py @@ -7,7 +7,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest do_sleeps = False diff --git a/test/test_aio.py b/test/test_aio.py index 6af705a..d03b2cd 100644 --- a/test/test_aio.py +++ b/test/test_aio.py @@ -24,7 +24,7 @@ from coro import oserrors import coro -import coro_unittest +from coro.test import coro_unittest import os import unittest import random diff --git a/test/test_asn1_python.py b/test/test_asn1_python.py index e1f4173..7035078 100644 --- a/test/test_asn1_python.py +++ b/test/test_asn1_python.py @@ -1,7 +1,7 @@ # -*- Mode: Python -*- import unittest -import coro_unittest +from coro.test import coro_unittest from coro.asn1.python import * from coro.asn1.ber import decode as D diff --git a/test/test_condition_variable.py b/test/test_condition_variable.py index ca5053e..392a01e 100644 --- a/test/test_condition_variable.py +++ b/test/test_condition_variable.py @@ -27,8 +27,8 @@ """ import coro -import coro_unittest import unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_ecdsa.py b/test/test_ecdsa.py index f164a85..8b4dc9c 100644 --- a/test/test_ecdsa.py +++ b/test/test_ecdsa.py @@ -4,7 +4,7 @@ import unittest from coro.ssl.openssl import ecdsa -import coro_unittest +from coro.test import coro_unittest test_key = ( '30820113020101042027a4909da59e97e1854a6d5ea26575b953d72da4cf285849ff9acce0d2156c' diff --git a/test/test_event_queue.py b/test/test_event_queue.py index b02688c..929a767 100644 --- a/test/test_event_queue.py +++ b/test/test_event_queue.py @@ -23,7 +23,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_in_parallel.py b/test/test_in_parallel.py index 11f75b1..16a4d9a 100644 --- a/test/test_in_parallel.py +++ b/test/test_in_parallel.py @@ -21,7 +21,7 @@ """Unittests for coro.in_parallel.""" import coro -import coro_unittest +from coro.test import coro_unittest import unittest class Test(unittest.TestCase): diff --git a/test/test_interrupt.py b/test/test_interrupt.py index 4777d87..109afa3 100644 --- a/test/test_interrupt.py +++ b/test/test_interrupt.py @@ -21,7 +21,7 @@ """Unittests for interrupting coroutines.""" import coro -import coro_unittest +from coro.test import coro_unittest import unittest class TestException(Exception): diff --git a/test/test_isemaphore.py b/test/test_isemaphore.py index af68efd..76f2105 100644 --- a/test/test_isemaphore.py +++ b/test/test_isemaphore.py @@ -21,8 +21,8 @@ """Unittests for inverted semaphore.""" import coro -import coro_unittest import unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_lio.py b/test/test_lio.py index 33ccb9c..f694b8f 100644 --- a/test/test_lio.py +++ b/test/test_lio.py @@ -25,7 +25,7 @@ """ import coro -import coro_unittest +from coro.test import coro_unittest import operator import os import tempfile diff --git a/test/test_local.py b/test/test_local.py index 08cbbc3..28a06d7 100644 --- a/test/test_local.py +++ b/test/test_local.py @@ -23,7 +23,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_mutex.py b/test/test_mutex.py index e157b83..efab6c9 100644 --- a/test/test_mutex.py +++ b/test/test_mutex.py @@ -21,7 +21,7 @@ """Unittests for mutex.""" import coro -import coro_unittest +from coro.test import coro_unittest import unittest class Test(unittest.TestCase): diff --git a/test/test_notify_of_close.py b/test/test_notify_of_close.py index b6f1fb0..dd8a509 100644 --- a/test/test_notify_of_close.py +++ b/test/test_notify_of_close.py @@ -21,10 +21,10 @@ """Unittests for the notify_of_close functionality.""" import coro -import coro_unittest import os import unittest from coro import oserrors +from coro.test import coro_unittest class ForceSend(coro.Interrupted): pass diff --git a/test/test_poller.py b/test/test_poller.py index cdd93d8..c5009ee 100644 --- a/test/test_poller.py +++ b/test/test_poller.py @@ -22,7 +22,7 @@ import coro # import coro_process -import coro_unittest +from coro.test import coro_unittest import os import unittest diff --git a/test/test_profile.py b/test/test_profile.py index c4cad4b..aea94c1 100644 --- a/test/test_profile.py +++ b/test/test_profile.py @@ -28,7 +28,7 @@ import coro import coro.profiler import coro.print_profile -import coro_unittest +from coro.test import coro_unittest # Sam's favorite profile function. def tak1 (x, y, z): diff --git a/test/test_readv.py b/test/test_readv.py index 0014a61..91b5e28 100644 --- a/test/test_readv.py +++ b/test/test_readv.py @@ -25,7 +25,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest do_sleeps = False diff --git a/test/test_rw_lock.py b/test/test_rw_lock.py index 14408f8..0e315bb 100644 --- a/test/test_rw_lock.py +++ b/test/test_rw_lock.py @@ -21,8 +21,8 @@ """Unittests for read-write lock.""" import coro -import coro_unittest import unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_semaphore.py b/test/test_semaphore.py index 95c7b32..a9c21ac 100644 --- a/test/test_semaphore.py +++ b/test/test_semaphore.py @@ -21,8 +21,8 @@ """Unittests for semaphore.""" import coro -import coro_unittest import unittest +from coro.test import coro_unittest class Test(unittest.TestCase): diff --git a/test/test_signal_handler.py b/test/test_signal_handler.py index 50e0f9a..4486b74 100644 --- a/test/test_signal_handler.py +++ b/test/test_signal_handler.py @@ -1,11 +1,11 @@ # -*- Mode: Python -*- import coro -import coro_unittest import unittest -from coro import signal_handler import os import signal +from coro import signal_handler +from coro.test import coro_unittest signal_caught_flag = False diff --git a/test/test_socket.py b/test/test_socket.py index 31d2f63..daac056 100644 --- a/test/test_socket.py +++ b/test/test_socket.py @@ -25,7 +25,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest class TestServer: diff --git a/test/test_with_timeout.py b/test/test_with_timeout.py index 69c59bf..35fd157 100644 --- a/test/test_with_timeout.py +++ b/test/test_with_timeout.py @@ -7,7 +7,7 @@ import os import coro -import coro_unittest +from coro.test import coro_unittest class TestWithTimeout (unittest.TestCase): diff --git a/test/test_writev.py b/test/test_writev.py index 37300ea..cc59353 100644 --- a/test/test_writev.py +++ b/test/test_writev.py @@ -25,7 +25,7 @@ import unittest import coro -import coro_unittest +from coro.test import coro_unittest current_buffer = '' finished = None