WIP #1293: Move src/greentest/greentest -> src/gevent/testing

Makefile

@@ -33,8 +33,6 @@ distclean: clean
 doc:
 	cd doc && PYTHONPATH=.. make html
 
-whitespace:
-	! find . -not -path "*.pem" -not -path "./.eggs/*" -not -path "./src/greentest/htmlcov/*" -not -path "./src/greentest/.coverage.*" -not -path "./.tox/*" -not -path "*/__pycache__/*" -not -path "*.so" -not -path "*.pyc" -not -path "./.git/*" -not -path "./build/*"  -not -path "./src/gevent/libev/*" -not -path "./src/gevent.egg-info/*" -not -path "./dist/*" -not -path "./.DS_Store" -not -path "./deps/*" -not -path "./src/gevent/libev/corecext.*.[ch]" -not -path "./src/gevent/resolver/cares.*" -not -path "./doc/_build/*" -not -path "./doc/mytheme/static/*" -type f | xargs egrep -l " $$"
 
 prospector:
 	which pylint

src/greentest/greentest/__init__.py → src/gevent/testing/__init__.py

@@ -20,106 +20,105 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# package is named greentest, not test, so it won't be confused with test in stdlib
 
 import unittest
 
 # pylint:disable=unused-import
 
-from greentest.sysinfo import VERBOSE
-from greentest.sysinfo import WIN
-from greentest.sysinfo import LINUX
-from greentest.sysinfo import LIBUV
-from greentest.sysinfo import CFFI_BACKEND
-from greentest.sysinfo import DEBUG
-from greentest.sysinfo import RUN_LEAKCHECKS
-from greentest.sysinfo import RUN_COVERAGE
+from .sysinfo import VERBOSE
+from .sysinfo import WIN
+from .sysinfo import LINUX
+from .sysinfo import LIBUV
+from .sysinfo import CFFI_BACKEND
+from .sysinfo import DEBUG
+from .sysinfo import RUN_LEAKCHECKS
+from .sysinfo import RUN_COVERAGE
 
-from greentest.sysinfo import PY2
-from greentest.sysinfo import PY3
-from greentest.sysinfo import PY34
-from greentest.sysinfo import PY36
-from greentest.sysinfo import PY37
+from .sysinfo import PY2
+from .sysinfo import PY3
+from .sysinfo import PY34
+from .sysinfo import PY36
+from .sysinfo import PY37
 
-from greentest.sysinfo import PYPY
-from greentest.sysinfo import PYPY3
-from greentest.sysinfo import CPYTHON
+from .sysinfo import PYPY
+from .sysinfo import PYPY3
+from .sysinfo import CPYTHON
 
-from greentest.sysinfo import PLATFORM_SPECIFIC_SUFFIXES
-from greentest.sysinfo import NON_APPLICABLE_SUFFIXES
-from greentest.sysinfo import SHARED_OBJECT_EXTENSION
+from .sysinfo import PLATFORM_SPECIFIC_SUFFIXES
+from .sysinfo import NON_APPLICABLE_SUFFIXES
+from .sysinfo import SHARED_OBJECT_EXTENSION
 
-from greentest.sysinfo import RUNNING_ON_TRAVIS
-from greentest.sysinfo import RUNNING_ON_APPVEYOR
-from greentest.sysinfo import RUNNING_ON_CI
+from .sysinfo import RUNNING_ON_TRAVIS
+from .sysinfo import RUNNING_ON_APPVEYOR
+from .sysinfo import RUNNING_ON_CI
 
-from greentest.sysinfo import RESOLVER_NOT_SYSTEM
-from greentest.sysinfo import RESOLVER_DNSPYTHON
-from greentest.sysinfo import RESOLVER_ARES
+from .sysinfo import RESOLVER_NOT_SYSTEM
+from .sysinfo import RESOLVER_DNSPYTHON
+from .sysinfo import RESOLVER_ARES
 
-from greentest.sysinfo import EXPECT_POOR_TIMER_RESOLUTION
+from .sysinfo import EXPECT_POOR_TIMER_RESOLUTION
 
-from greentest.sysinfo import CONN_ABORTED_ERRORS
+from .sysinfo import CONN_ABORTED_ERRORS
 
-from greentest.skipping import skipOnWindows
-from greentest.skipping import skipOnAppVeyor
-from greentest.skipping import skipOnCI
-from greentest.skipping import skipOnPyPy3OnCI
-from greentest.skipping import skipOnPyPy
-from greentest.skipping import skipOnPyPyOnCI
-from greentest.skipping import skipOnPyPy3
-from greentest.skipping import skipIf
-from greentest.skipping import skipOnLibev
-from greentest.skipping import skipOnLibuv
-from greentest.skipping import skipOnLibuvOnWin
-from greentest.skipping import skipOnLibuvOnCI
-from greentest.skipping import skipOnLibuvOnCIOnPyPy
-from greentest.skipping import skipOnLibuvOnPyPyOnWin
-from greentest.skipping import skipOnPurePython
-from greentest.skipping import skipWithCExtensions
-from greentest.skipping import skipOnLibuvOnTravisOnCPython27
-from greentest.skipping import skipOnPy37
+from .skipping import skipOnWindows
+from .skipping import skipOnAppVeyor
+from .skipping import skipOnCI
+from .skipping import skipOnPyPy3OnCI
+from .skipping import skipOnPyPy
+from .skipping import skipOnPyPyOnCI
+from .skipping import skipOnPyPy3
+from .skipping import skipIf
+from .skipping import skipOnLibev
+from .skipping import skipOnLibuv
+from .skipping import skipOnLibuvOnWin
+from .skipping import skipOnLibuvOnCI
+from .skipping import skipOnLibuvOnCIOnPyPy
+from .skipping import skipOnLibuvOnPyPyOnWin
+from .skipping import skipOnPurePython
+from .skipping import skipWithCExtensions
+from .skipping import skipOnLibuvOnTravisOnCPython27
+from .skipping import skipOnPy37
 
-from greentest.exception import ExpectedException
+from .exception import ExpectedException
 
 
-from greentest.leakcheck import ignores_leakcheck
+from .leakcheck import ignores_leakcheck
 
 
 
-from greentest.params import LARGE_TIMEOUT
+from .params import LARGE_TIMEOUT
 
-from greentest.params import DEFAULT_LOCAL_HOST_ADDR
-from greentest.params import DEFAULT_LOCAL_HOST_ADDR6
-from greentest.params import DEFAULT_BIND_ADDR
+from .params import DEFAULT_LOCAL_HOST_ADDR
+from .params import DEFAULT_LOCAL_HOST_ADDR6
+from .params import DEFAULT_BIND_ADDR
 
 
-from greentest.params import DEFAULT_SOCKET_TIMEOUT
-from greentest.params import DEFAULT_XPC_SOCKET_TIMEOUT
+from .params import DEFAULT_SOCKET_TIMEOUT
+from .params import DEFAULT_XPC_SOCKET_TIMEOUT
 
 main = unittest.main
 
-from greentest.hub import QuietHub
+from .hub import QuietHub
 
 import gevent.hub
 gevent.hub.set_default_hub_class(QuietHub)
 
 
 
-from greentest.sockets import bind_and_listen
-from greentest.sockets import tcp_listener
+from .sockets import bind_and_listen
+from .sockets import tcp_listener
 
-from greentest.openfiles import get_number_open_files
-from greentest.openfiles import get_open_files
+from .openfiles import get_number_open_files
+from .openfiles import get_open_files
 
-from greentest.testcase import TestCase
+from .testcase import TestCase
 
-from greentest.modules import walk_modules
+from .modules import walk_modules
 
 BaseTestCase = unittest.TestCase
 
-from greentest.flaky import reraiseFlakyTestTimeout
-from greentest.flaky import reraiseFlakyTestRaceCondition
+from .flaky import reraiseFlakyTestTimeout
+from .flaky import reraiseFlakyTestRaceCondition
 
 try:
     from unittest import mock

src/greentest/greentest/flaky.py → src/gevent/testing/flaky.py

@@ -25,8 +25,8 @@ import unittest
 
 from gevent.util import dump_stacks
 
-from greentest import sysinfo
-from greentest import six
+from . import sysinfo
+from . import six
 
 class FlakyAssertionError(AssertionError):
     "Re-raised so that we know it's a known-flaky test."

src/greentest/greentest/hub.py → src/gevent/testing/hub.py

@@ -22,7 +22,7 @@ from __future__ import absolute_import, print_function, division
 
 from gevent.hub import Hub
 
-from greentest.exception import ExpectedException
+from .exception import ExpectedException
 
 class QuietHub(Hub):
 

src/greentest/greentest/leakcheck.py → src/gevent/testing/leakcheck.py

@@ -68,7 +68,11 @@ class _RefCountChecker(object):
         self.needs_setUp = False
 
     def _ignore_object_p(self, obj):
-        if obj is self or obj in self.__dict__.values() or obj == self._ignore_object_p:
+        if (
+                obj is self
+                or obj in self.__dict__.values()
+                or obj == self._ignore_object_p # pylint:disable=comparison-with-callable
+        ):
             return False
         kind = type(obj)
         if kind in self.IGNORED_TYPES:

src/greentest/greentest/modules.py → src/gevent/testing/modules.py

@@ -23,8 +23,8 @@ import os.path
 
 import gevent
 
-from greentest import sysinfo
-from greentest import six
+from . import sysinfo
+from . import six
 
 OPTIONAL_MODULES = ['resolver_ares']
 

src/greentest/greentest/monkey_test.py → src/gevent/testing/monkey_test.py

@@ -18,9 +18,9 @@ print('Running with patch_all(%s): %s' % (','.join('%s=%r' % x for x in kwargs.i
 from gevent import monkey
 monkey.patch_all(**kwargs)
 
-from greentest.sysinfo import RUNNING_ON_APPVEYOR
-from greentest.sysinfo import PY37
-from greentest.patched_tests_setup import disable_tests_in_source
+from .sysinfo import RUNNING_ON_APPVEYOR
+from .sysinfo import PY37
+from .patched_tests_setup import disable_tests_in_source
 try:
     from test import support
 except ImportError:

src/greentest/greentest/openfiles.py → src/gevent/testing/openfiles.py

@@ -23,7 +23,7 @@ import os
 import unittest
 import re
 
-from greentest import sysinfo
+from . import sysinfo
 
 # Linux/OS X/BSD platforms can implement this by calling out to lsof
 
@@ -75,11 +75,11 @@ def default_get_number_open_files():
         # Linux only
         fd_directory = '/proc/%d/fd' % os.getpid()
         return len(os.listdir(fd_directory))
-    else:
-        try:
-            return len(get_open_files(pipes=True)) - 1
-        except (OSError, AssertionError, unittest.SkipTest):
-            return 0
+
+    try:
+        return len(get_open_files(pipes=True)) - 1
+    except (OSError, AssertionError, unittest.SkipTest):
+        return 0
 
 lsof_get_open_files = default_get_open_files
 

src/greentest/greentest/params.py → src/gevent/testing/params.py

@@ -19,16 +19,16 @@
 # THE SOFTWARE.
 
 
-from greentest.sysinfo import PY3
-from greentest.sysinfo import PYPY
-from greentest.sysinfo import WIN
-from greentest.sysinfo import LIBUV
-from greentest.sysinfo import OSX
+from .sysinfo import PY3
+from .sysinfo import PYPY
+from .sysinfo import WIN
+from .sysinfo import LIBUV
+from .sysinfo import OSX
 
-from greentest.sysinfo import RUNNING_ON_TRAVIS
-from greentest.sysinfo import RUNNING_ON_APPVEYOR
-from greentest.sysinfo import EXPECT_POOR_TIMER_RESOLUTION
-from greentest.sysinfo import RESOLVER_ARES
+from .sysinfo import RUNNING_ON_TRAVIS
+from .sysinfo import RUNNING_ON_APPVEYOR
+from .sysinfo import EXPECT_POOR_TIMER_RESOLUTION
+from .sysinfo import RESOLVER_ARES
 
 
 # Travis is slow and overloaded; Appveyor used to be faster, but

src/greentest/greentest/patched_tests_setup.py → src/gevent/testing/patched_tests_setup.py

-# pylint:disable=missing-docstring,invalid-name
+# pylint:disable=missing-docstring,invalid-name,too-many-lines
 from __future__ import print_function, absolute_import, division
 
 import collections
@@ -13,26 +13,26 @@ import os
 # import platform
 import re
 
-from greentest.sysinfo import RUNNING_ON_APPVEYOR as APPVEYOR
-from greentest.sysinfo import RUNNING_ON_TRAVIS as TRAVIS
-from greentest.sysinfo import RESOLVER_NOT_SYSTEM as ARES
-from greentest.sysinfo import RUN_COVERAGE
+from .sysinfo import RUNNING_ON_APPVEYOR as APPVEYOR
+from .sysinfo import RUNNING_ON_TRAVIS as TRAVIS
+from .sysinfo import RESOLVER_NOT_SYSTEM as ARES
+from .sysinfo import RUN_COVERAGE
 
 
-from greentest.sysinfo import PYPY
-from greentest.sysinfo import PYPY3
-from greentest.sysinfo import PY3
-from greentest.sysinfo import PY2
-from greentest.sysinfo import PY34
-from greentest.sysinfo import PY35
-from greentest.sysinfo import PY36
-from greentest.sysinfo import PY37
+from .sysinfo import PYPY
+from .sysinfo import PYPY3
+from .sysinfo import PY3
+from .sysinfo import PY2
+from .sysinfo import PY34
+from .sysinfo import PY35
+from .sysinfo import PY36
+from .sysinfo import PY37
 
-from greentest.sysinfo import WIN
-from greentest.sysinfo import OSX
+from .sysinfo import WIN
+from .sysinfo import OSX
 
-from greentest.sysinfo import LIBUV
-from greentest.sysinfo import CFFI_BACKEND
+from .sysinfo import LIBUV
+from .sysinfo import CFFI_BACKEND
 
 CPYTHON = not PYPY
 
@@ -1074,7 +1074,7 @@ def disable_tests_in_source(source, filename):
         # If we do it on a def-by-def basis, we can break syntax
         # if the function is already decorated
         pattern = r'^import .*'
-        replacement = r'from greentest import patched_tests_setup as _GEVENT_PTS;'
+        replacement = r'from . import patched_tests_setup as _GEVENT_PTS;'
         replacement += r'import unittest as _GEVENT_UTS;'
         replacement += r'\g<0>'
         source, n = re.subn(pattern, replacement, source, 1, re.MULTILINE)

src/greentest/greentest/skipping.py → src/gevent/testing/skipping.py

@@ -21,7 +21,7 @@ from __future__ import absolute_import, print_function, division
 
 import unittest
 
-from greentest import sysinfo
+from . import sysinfo
 
 def _identity(f):
     return f

src/greentest/greentest/sockets.py → src/gevent/testing/sockets.py

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 from __future__ import absolute_import, print_function, division
 
-from greentest.params import DEFAULT_BIND_ADDR_TUPLE
+from .params import DEFAULT_BIND_ADDR_TUPLE
 
 def bind_and_listen(sock, address=DEFAULT_BIND_ADDR_TUPLE, backlog=50, reuse_addr=True):
     from socket import SOL_SOCKET, SO_REUSEADDR, error

src/greentest/greentest/switching.py → src/gevent/testing/switching.py

@@ -23,9 +23,9 @@ from functools import wraps
 
 from gevent.hub import _get_hub
 
-from greentest.hub import QuietHub
+from .hub import QuietHub
 
-from greentest.patched_tests_setup import get_switch_expected
+from .patched_tests_setup import get_switch_expected
 
 def wrap_switch_count_check(method):
     @wraps(method)

src/greentest/greentest/testcase.py → src/gevent/testing/testcase.py

@@ -26,13 +26,13 @@ from functools import wraps
 
 import gevent
 
-from greentest import sysinfo
-from greentest import params
-from greentest import leakcheck
-from greentest import errorhandler
-from greentest import flaky
+from . import sysinfo
+from . import params
+from . import leakcheck
+from . import errorhandler
+from . import flaky
 
-from greentest.patched_tests_setup import get_switch_expected
+from .patched_tests_setup import get_switch_expected
 
 class TimeAssertMixin(object):
     def assertTimeoutAlmostEqual(self, first, second, places=None, msg=None, delta=None):

src/greentest/greentest/testrunner.py → src/gevent/testing/testrunner.py

@@ -10,16 +10,16 @@ from datetime import timedelta
 
 from multiprocessing.pool import ThreadPool
 from multiprocessing import cpu_count
-from greentest import util
-from greentest.util import log
-from greentest.sysinfo import RUNNING_ON_CI
-from greentest.sysinfo import PYPY
-from greentest.sysinfo import PY3
-from greentest.sysinfo import PY2
-from greentest.sysinfo import RESOLVER_ARES
-from greentest.sysinfo import LIBUV
-from greentest.sysinfo import RUN_LEAKCHECKS
-from greentest import six
+from . import util
+from .util import log
+from .sysinfo import RUNNING_ON_CI
+from .sysinfo import PYPY
+from .sysinfo import PY3
+from .sysinfo import PY2
+from .sysinfo import RESOLVER_ARES
+from .sysinfo import LIBUV
+from .sysinfo import RUN_LEAKCHECKS
+from . import six
 
 # Import this while we're probably single-threaded/single-processed
 # to try to avoid issues with PyPy 5.10.
@@ -113,7 +113,7 @@ if PYPY:
 
 
 def run_many(tests, configured_failing_tests=(), failfast=False, quiet=False):
-    # pylint:disable=too-many-locals
+    # pylint:disable=too-many-locals,too-many-statements
     global NWORKERS
     start = time.time()
     total = 0
@@ -158,8 +158,8 @@ def run_many(tests, configured_failing_tests=(), failfast=False, quiet=False):
                 r = pool.apply_async(run_one, (cmd, ), options or {})
                 results.append(r)
                 return
-            else:
-                time.sleep(0.1)
+
+            time.sleep(0.05)
 
     run_alone = []
 

src/greentest/greentest/timing.py → src/gevent/testing/timing.py

@@ -22,9 +22,9 @@ import time
 
 import gevent
 
-from greentest import sysinfo
-from greentest import leakcheck
-from greentest.testcase import TestCase
+from . import sysinfo
+from . import leakcheck
+from .testcase import TestCase
 
 SMALLEST_RELIABLE_DELAY = 0.001 # 1ms, because of libuv
 

src/greentest/greentest/util.py → src/gevent/testing/util.py

 import sys
 import os
-from greentest import six
+from . import six
 import traceback
 import unittest
 import threading

src/greentest/known_failures.py

@@ -6,17 +6,17 @@ import os
 import sys
 import struct
 
-from greentest.sysinfo import RUNNING_ON_APPVEYOR as APPVEYOR
-from greentest.sysinfo import RUNNING_ON_TRAVIS as TRAVIS
-from greentest.sysinfo import RUN_LEAKCHECKS as LEAKTEST
-from greentest.sysinfo import RUN_COVERAGE as COVERAGE
-from greentest.sysinfo import RESOLVER_NOT_SYSTEM
+from gevent.testing.sysinfo import RUNNING_ON_APPVEYOR as APPVEYOR
+from gevent.testing.sysinfo import RUNNING_ON_TRAVIS as TRAVIS
+from gevent.testing.sysinfo import RUN_LEAKCHECKS as LEAKTEST
+from gevent.testing.sysinfo import RUN_COVERAGE as COVERAGE
+from gevent.testing.sysinfo import RESOLVER_NOT_SYSTEM
 
-from greentest.sysinfo import PYPY
-from greentest.sysinfo import PY3
-from greentest.sysinfo import PY35
+from gevent.testing.sysinfo import PYPY
+from gevent.testing.sysinfo import PY3
+from gevent.testing.sysinfo import PY35
 
-from greentest.sysinfo import LIBUV
+from gevent.testing.sysinfo import LIBUV
 
 IGNORED_TESTS = []
 

src/greentest/lock_tests.py

@@ -15,7 +15,7 @@ try:
 except ImportError:
     from test import test_support as support
 
-from greentest.testcase import TimeAssertMixin
+from gevent.testing.testcase import TimeAssertMixin
 
 def _wait():
     # A crude wait/yield function not relying on synchronization primitives.

src/greentest/test___example_servers.py

@@ -9,10 +9,10 @@ from unittest import SkipTest
 import socket
 import ssl
 
-import greentest
-from greentest import DEFAULT_XPC_SOCKET_TIMEOUT
-from greentest import util
-from greentest import params
+import gevent.testing as greentest
+from gevent.testing import DEFAULT_XPC_SOCKET_TIMEOUT
+from gevent.testing import util
+from gevent.testing import params
 
 @greentest.skipOnCI("Timing issues sometimes lead to a connection refused")
 class Test_wsgiserver(util.TestServer):

src/greentest/test___ident.py

@@ -8,7 +8,7 @@ from __future__ import print_function
 import gc
 
 
-import greentest
+import gevent.testing as greentest
 from gevent._ident import IdentRegistry
 from gevent._compat import PYPY
 

src/greentest/test___monitor.py

@@ -11,7 +11,7 @@ from gevent.monkey import get_original
 from gevent._compat import thread_mod_name
 from gevent._compat import NativeStrIO
 
-from greentest.skipping import skipOnPyPyOnWindows
+from gevent.testing.skipping import skipOnPyPyOnWindows
 
 from gevent import _monitor as monitor
 from gevent import config as GEVENT_CONFIG

src/greentest/test___monkey_patching.py

@@ -5,7 +5,7 @@ import glob
 import atexit
 # subprocess: include in subprocess tests
 
-from greentest import util
+from gevent.testing import util
 
 TIMEOUT = 120
 directory = '%s.%s' % sys.version_info[:2]
@@ -62,7 +62,7 @@ def TESTRUNNER(tests=None):
     if tests and not sys.platform.startswith("win"):
         atexit.register(os.system, 'rm -f */@test*')
 
-    basic_args = [sys.executable, '-u', '-W', 'ignore', '-m' 'greentest.monkey_test']
+    basic_args = [sys.executable, '-u', '-W', 'ignore', '-m' 'gevent.testing.monkey_test']
     for filename in tests:
         if filename in version_tests:
             util.log("Overriding %s from %s with file from %s", filename, directory, full_directory)
@@ -75,7 +75,7 @@ def TESTRUNNER(tests=None):
 
 
 def main():
-    from greentest import testrunner
+    from gevent.testing import testrunner
     return testrunner.run_many(list(TESTRUNNER(sys.argv[1:])))
 
 

src/greentest/test__all__.py

 """Check __all__, __implements__, __extensions__, __imports__ of the modules"""
 from __future__ import print_function
-from greentest import six
+from gevent.testing import six
 import sys
 import unittest
 import types
-from greentest.modules import walk_modules
-from greentest.sysinfo import PLATFORM_SPECIFIC_SUFFIXES
+from gevent.testing.modules import walk_modules
+from gevent.testing.sysinfo import PLATFORM_SPECIFIC_SUFFIXES
 
 from gevent._patcher import MAPPING
 

src/greentest/test__api.py

@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent import util, socket
 

src/greentest/test__api_timeout.py

@@ -20,7 +20,7 @@
 # THE SOFTWARE.
 
 import sys
-import greentest
+import gevent.testing as greentest
 import weakref
 import time
 import gc
@@ -30,7 +30,7 @@ from gevent import Timeout
 from gevent import get_hub
 
 
-from greentest.timing import SMALL_TICK as DELAY
+from gevent.testing.timing import SMALL_TICK as DELAY
 
 
 class Error(Exception):

src/greentest/test__ares_host_result.py

@@ -2,7 +2,7 @@ from __future__ import print_function
 
 import pickle
 import sys
-import greentest
+import gevent.testing as greentest
 try:
     from gevent.resolver.cares import ares_host_result
 except ImportError as ex:

src/greentest/test__backdoor.py

 from __future__ import print_function
-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent import socket
 from gevent import backdoor

src/greentest/test__core.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import, print_function, division
 import sys
 import unittest
-import greentest
+import gevent.testing as greentest
 
 from gevent import core
 

src/greentest/test__core_stat.py

@@ -7,8 +7,8 @@ import time
 import gevent
 import gevent.core
 
-import greentest
-import greentest.flaky
+import gevent.testing as greentest
+import gevent.testing.flaky
 
 #pylint: disable=protected-access
 
@@ -83,7 +83,7 @@ class TestCoreStat(greentest.TestCase):
 
         if reaction <= 0.0:
             # Sigh. This is especially true on PyPy on Windows
-            raise greentest.flaky.FlakyTestRaceCondition(
+            raise gevent.testing.flaky.FlakyTestRaceCondition(
                 "Bad timer resolution (on Windows?), test is useless. Start %s, now %s" % (start, now))
 
         self.assertGreaterEqual(

src/greentest/test__core_timer.py

 from __future__ import print_function
 from gevent import config
 
-import greentest
-from greentest import TestCase
-from greentest import LARGE_TIMEOUT
-from greentest.sysinfo import CFFI_BACKEND
-from greentest.flaky import reraises_flaky_timeout
+import gevent.testing as greentest
+from gevent.testing import TestCase
+from gevent.testing import LARGE_TIMEOUT
+from gevent.testing.sysinfo import CFFI_BACKEND
+from gevent.testing.flaky import reraises_flaky_timeout
 
 
 class Test(TestCase):

src/greentest/test__core_watcher.py

 from __future__ import absolute_import, print_function
 
-import greentest
+import gevent.testing as greentest
 from gevent import config
-from greentest.sysinfo import CFFI_BACKEND
+from gevent.testing.sysinfo import CFFI_BACKEND
 
 from gevent.core import READ # pylint:disable=no-name-in-module
 from gevent.core import WRITE # pylint:disable=no-name-in-module

src/greentest/test__doctests.py

@@ -9,8 +9,8 @@ import unittest
 
 import gevent
 from gevent import socket
-from greentest import walk_modules
-from greentest import sysinfo
+from gevent.testing import walk_modules
+from gevent.testing import sysinfo
 
 # Ignore tracebacks: ZeroDivisionError
 

src/greentest/test__event.py

@@ -5,13 +5,13 @@ import weakref
 import gevent
 from gevent.event import Event, AsyncResult
 
-import greentest
+import gevent.testing as greentest
 
-from greentest.six import xrange
-from greentest.timing import AbstractGenericGetTestCase
-from greentest.timing import AbstractGenericWaitTestCase
-from greentest.timing import SMALL_TICK
-from greentest.timing import SMALL_TICK_MAX_ADJ
+from gevent.testing.six import xrange
+from gevent.testing.timing import AbstractGenericGetTestCase
+from gevent.testing.timing import AbstractGenericWaitTestCase
+from gevent.testing.timing import SMALL_TICK
+from gevent.testing.timing import SMALL_TICK_MAX_ADJ
 
 DELAY = SMALL_TICK + SMALL_TICK_MAX_ADJ
 

src/greentest/test__example_echoserver.py

 from gevent.socket import create_connection, timeout
-import greentest
+import gevent.testing as greentest
 import gevent
 
-from greentest import util
-from greentest import params
+from gevent.testing import util
+from gevent.testing import params
 
 class Test(util.TestServer):
     server = 'echoserver.py'

src/greentest/test__example_portforwarder.py

@@ -8,8 +8,8 @@ from time import sleep
 import gevent
 from gevent.server import StreamServer
 
-import greentest
-from greentest import util
+import gevent.testing as greentest
+from gevent.testing import util
 
 @greentest.skipOnLibuvOnCIOnPyPy("Timing issues sometimes lead to connection refused")
 class Test(util.TestServer):

src/greentest/test__example_udp_client.py

@@ -2,8 +2,8 @@ from gevent import monkey; monkey.patch_all(subprocess=True)
 import sys
 from gevent.server import DatagramServer
 from unittest import TestCase
-from greentest.util import run
-from greentest import main
+from gevent.testing.util import run
+from gevent.testing import main
 
 class Test_udp_client(TestCase):
 

src/greentest/test__example_udp_server.py

 import socket
 
-from greentest import util
-from greentest import main
+from gevent.testing import util
+from gevent.testing import main
 
 
 class Test(util.TestServer):

src/greentest/test__examples.py

@@ -3,8 +3,8 @@ import os
 import glob
 import time
 
-import greentest
-from greentest import util
+import gevent.testing as greentest
+from gevent.testing import util
 
 
 cwd = '../../examples/'

src/greentest/test__exc_info.py

 import gevent
 import sys
-import greentest
-from greentest import six
-from greentest import ExpectedException as ExpectedError
+import gevent.testing as greentest
+from gevent.testing import six
+from gevent.testing import ExpectedException as ExpectedError
 
 if not six.PY3:
     sys.exc_clear()

src/greentest/test__execmodules.py

 import unittest
 
-from greentest.modules import walk_modules
-from greentest import main
-from greentest.sysinfo import NON_APPLICABLE_SUFFIXES
+from gevent.testing.modules import walk_modules
+from gevent.testing import main
+from gevent.testing.sysinfo import NON_APPLICABLE_SUFFIXES
 
 
-from greentest import six
+from gevent.testing import six
 
 
 class TestExec(unittest.TestCase):

src/greentest/test__fileobject.py

@@ -8,11 +8,11 @@ import unittest
 import gevent
 from gevent.fileobject import FileObject, FileObjectThread
 
-import greentest
-from greentest.sysinfo import PY3
-from greentest.flaky import reraiseFlakyTestRaceConditionLibuv
-from greentest.skipping import skipOnLibuvOnCIOnPyPy
-from greentest.skipping import skipOnWindows
+import gevent.testing as greentest
+from gevent.testing.sysinfo import PY3
+from gevent.testing.flaky import reraiseFlakyTestRaceConditionLibuv
+from gevent.testing.skipping import skipOnLibuvOnCIOnPyPy
+from gevent.testing.skipping import skipOnWindows
 
 try:
     ResourceWarning

src/greentest/test__greenio.py

@@ -21,9 +21,9 @@ import sys
 import gevent
 from gevent import socket
 
-from greentest import TestCase, main, tcp_listener
-from greentest import skipOnPyPy
-from greentest import params
+from gevent.testing import TestCase, main, tcp_listener
+from gevent.testing import skipOnPyPy
+from gevent.testing import params
 
 
 

src/greentest/test__greenlet.py

@@ -21,7 +21,7 @@
 import re
 import unittest
 
-import greentest
+import gevent.testing as greentest
 import gevent
 
 from gevent import sleep, with_timeout, getcurrent
@@ -29,9 +29,9 @@ from gevent import greenlet
 from gevent.event import AsyncResult
 from gevent.queue import Queue, Channel
 
-from greentest.timing import AbstractGenericWaitTestCase
-from greentest.timing import AbstractGenericGetTestCase
-from greentest import timing
+from gevent.testing.timing import AbstractGenericWaitTestCase
+from gevent.testing.timing import AbstractGenericGetTestCase
+from gevent.testing import timing
 
 DELAY = timing.SMALL_TICK
 greentest.TestCase.error_fatal = False

src/greentest/test__greenletset.py

 from __future__ import print_function, division, absolute_import
 import time
-import greentest
+import gevent.testing as greentest
 
-from greentest import timing
+from gevent.testing import timing
 import gevent
 from gevent import pool
 from gevent.timeout import Timeout

src/greentest/test__greenness.py

@@ -26,7 +26,7 @@ If either operation blocked the whole script would block and timeout.
 from gevent import monkey
 monkey.patch_all()
 
-import greentest
+import gevent.testing as greentest
 
 try:
     import urllib2
@@ -38,7 +38,7 @@ except ImportError:
     from http import server as BaseHTTPServer
 
 import gevent
-from greentest import params
+from gevent.testing import params
 
 
 class TestGreenness(greentest.TestCase):

src/greentest/test__hub.py

@@ -22,8 +22,8 @@
 import re
 import time
 
-import greentest
-import greentest.timing
+import gevent.testing as greentest
+import gevent.testing.timing
 
 import gevent
 from gevent import socket
@@ -78,7 +78,7 @@ class TestExceptionInMainloop(greentest.TestCase):
 
 
 
-class TestSleep(greentest.timing.AbstractGenericWaitTestCase):
+class TestSleep(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def wait(self, timeout):
         gevent.sleep(timeout)
@@ -87,7 +87,7 @@ class TestSleep(greentest.timing.AbstractGenericWaitTestCase):
         gevent.sleep(0)
 
 
-class TestWaiterGet(greentest.timing.AbstractGenericWaitTestCase):
+class TestWaiterGet(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def setUp(self):
         super(TestWaiterGet, self).setUp()

src/greentest/test__issue330.py

 # A greenlet that's killed before it is ever started
 # should never be switched to
 import gevent
-import greentest
+import gevent.testing as greentest
 
 
 class MyException(Exception):

src/greentest/test__issue600.py

@@ -10,7 +10,7 @@ import sys
 from multiprocessing import Process
 from subprocess import Popen, PIPE
 
-import greentest
+import gevent.testing as greentest
 
 def f(sleep_sec):
     gevent.sleep(sleep_sec)

src/greentest/test__issue607.py

 # A greenlet that's killed with an exception should fail.
-import greentest
+import gevent.testing as greentest
 import gevent
 
 

src/greentest/test__issues461_471.py

@@ -29,10 +29,10 @@ else:
     import time
 
     import unittest
-    import greentest
-    from greentest.sysinfo import CFFI_BACKEND
-    from greentest.sysinfo import RUN_COVERAGE
-    from greentest.sysinfo import WIN
+    import gevent.testing as greentest
+    from gevent.testing.sysinfo import CFFI_BACKEND
+    from gevent.testing.sysinfo import RUN_COVERAGE
+    from gevent.testing.sysinfo import WIN
 
     class Test(unittest.TestCase):
 

src/greentest/test__iwait.py

 import gevent
-import greentest
+import gevent.testing as greentest
 from gevent.lock import Semaphore
 
 

src/greentest/test__local.py

-import greentest
+import gevent.testing as greentest
 from copy import copy
 # Comment the line below to see that the standard thread.local is working correct
 from gevent import monkey; monkey.patch_all()

src/greentest/test__makefile_ref.py

@@ -9,7 +9,7 @@ import errno
 import weakref
 
 
-import greentest
+import gevent.testing as greentest
 
 
 dirname = os.path.dirname(os.path.abspath(__file__))
@@ -26,7 +26,7 @@ if PY3:
 fd_types = (int, long)
 WIN = greentest.WIN
 
-from greentest import get_open_files
+from gevent.testing import get_open_files
 try:
     import psutil
 except ImportError:

src/greentest/test__memleak.py

 import sys
 
 
-from greentest import TestCase, main
+from gevent.testing import TestCase, main
 import gevent
 from gevent.timeout import Timeout
 

src/greentest/test__monkey.py

@@ -5,7 +5,7 @@ monkey.patch_all()
 
 import sys
 import unittest
-from greentest.testcase import SubscriberCleanupMixin
+from gevent.testing.testcase import SubscriberCleanupMixin
 
 class TestMonkey(SubscriberCleanupMixin, unittest.TestCase):
 

src/greentest/test__monkey_selectors.py

 
 import sys
-import greentest
+import gevent.testing as greentest
 try:
     import selectors # Do this before the patch, just to force it
 except ImportError:

src/greentest/test__nondefaultloop.py

 # test for issue #210
 from gevent import core
-from greentest.util import alarm
+from gevent.testing.util import alarm
 
 
 alarm(1)

src/greentest/test__order.py

 import gevent
-import greentest
-from greentest.six import xrange
+import gevent.testing as greentest
+from gevent.testing.six import xrange
 
 
 class appender(object):

src/greentest/test__os.py

@@ -6,12 +6,12 @@ from os import pipe
 
 import gevent
 from gevent import os
-from greentest import TestCase, main, LARGE_TIMEOUT
+from gevent.testing import TestCase, main, LARGE_TIMEOUT
 from gevent import Greenlet, joinall
 
-from greentest import mock
-from greentest import six
-from greentest.skipping import skipOnLibuvOnPyPyOnWin
+from gevent.testing import mock
+from gevent.testing import six
+from gevent.testing.skipping import skipOnLibuvOnPyPyOnWin
 
 
 class TestOS_tp(TestCase):

src/greentest/test__pool.py

@@ -4,10 +4,10 @@ import gevent.pool
 from gevent.event import Event
 from gevent.queue import Queue
 
-import greentest
-import greentest.timing
+import gevent.testing as greentest
+import gevent.testing.timing
 import random
-from greentest import ExpectedException
+from gevent.testing import ExpectedException
 
 import unittest
 
@@ -492,7 +492,7 @@ class TestPool0(greentest.TestCase):
         self.assertEqual(0, p.wait_available(timeout=0.01))
 
 
-class TestJoinSleep(greentest.timing.AbstractGenericWaitTestCase):
+class TestJoinSleep(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def wait(self, timeout):
         p = gevent.pool.Pool()
@@ -503,7 +503,7 @@ class TestJoinSleep(greentest.timing.AbstractGenericWaitTestCase):
             g.kill()
 
 
-class TestJoinSleep_raise_error(greentest.timing.AbstractGenericWaitTestCase):
+class TestJoinSleep_raise_error(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def wait(self, timeout):
         p = gevent.pool.Pool()

src/greentest/test__pywsgi.py

@@ -43,9 +43,9 @@ import weakref
 
 from wsgiref.validate import validator
 
-import greentest
+import gevent.testing as greentest
 import gevent
-from greentest import PY3, PYPY
+from gevent.testing import PY3, PYPY
 from gevent import socket
 from gevent import pywsgi
 from gevent.pywsgi import Input

src/greentest/test__queue.py

 import unittest
 
-import greentest
-from greentest import TestCase, main
+import gevent.testing as greentest
+from gevent.testing import TestCase, main
 import gevent
 from gevent.hub import get_hub, LoopExit
 from gevent import util
 from gevent import queue
 from gevent.queue import Empty, Full
 from gevent.event import AsyncResult
-from greentest.timing import AbstractGenericGetTestCase
+from gevent.testing.timing import AbstractGenericGetTestCase
 
 # pylint:disable=too-many-ancestors
 

src/greentest/test__refcount.py

@@ -40,9 +40,9 @@ else:
 import _socket
 _socket.socket = Socket
 
-import greentest
+import gevent.testing as greentest
 from gevent import monkey; monkey.patch_all()
-from greentest import flaky
+from gevent.testing import flaky
 
 from pprint import pformat
 try:

src/greentest/test__select.py

-from greentest import six
+from gevent.testing import six
 import sys
 import os
 import errno
 from gevent import select, socket
 import gevent.core
-import greentest
-import greentest.timing
+import gevent.testing as greentest
+import gevent.testing.timing
 import unittest
 
 
-class TestSelect(greentest.timing.AbstractGenericWaitTestCase):
+class TestSelect(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def wait(self, timeout):
         select.select([], [], [], timeout)
@@ -17,7 +17,7 @@ class TestSelect(greentest.timing.AbstractGenericWaitTestCase):
 
 
 @greentest.skipOnWindows("Cant select on files")
-class TestSelectRead(greentest.timing.AbstractGenericWaitTestCase):
+class TestSelectRead(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     def wait(self, timeout):
         r, w = os.pipe()
@@ -49,7 +49,7 @@ class TestSelectRead(greentest.timing.AbstractGenericWaitTestCase):
 
 @unittest.skipUnless(hasattr(select, 'poll'), "Needs poll")
 @greentest.skipOnWindows("Cant poll on files")
-class TestPollRead(greentest.timing.AbstractGenericWaitTestCase):
+class TestPollRead(gevent.testing.timing.AbstractGenericWaitTestCase):
     def wait(self, timeout):
         # On darwin, the read pipe is reported as writable
         # immediately, for some reason. So we carefully register

src/greentest/test__semaphore.py

-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent.lock import Semaphore
 from gevent.thread import allocate_lock

src/greentest/test__server.py

@@ -4,9 +4,9 @@ import errno
 import os
 
 
-import greentest
-from greentest import PY3
-from greentest import DEFAULT_SOCKET_TIMEOUT as _DEFAULT_SOCKET_TIMEOUT
+import gevent.testing as greentest
+from gevent.testing import PY3
+from gevent.testing import DEFAULT_SOCKET_TIMEOUT as _DEFAULT_SOCKET_TIMEOUT
 from gevent import socket
 import gevent
 from gevent.server import StreamServer

src/greentest/test__server_pywsgi.py

 import socket
 
-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent import pywsgi
 

src/greentest/test__signal.py

 from __future__ import print_function
 import signal
-import greentest
+import gevent.testing as greentest
 import gevent
 import pkg_resources
 

src/greentest/test__sleep0.py

 import gevent
-from greentest.util import alarm
+from gevent.testing.util import alarm
 
 
 alarm(3)

src/greentest/test__socket.py

@@ -7,10 +7,10 @@ import socket
 import traceback
 import time
 import unittest
-import greentest
+import gevent.testing as greentest
 from functools import wraps
-from greentest import six
-from greentest import LARGE_TIMEOUT
+from gevent.testing import six
+from gevent.testing import LARGE_TIMEOUT
 
 # we use threading on purpose so that we can test both regular and gevent sockets with the same code
 from threading import Thread as _Thread

src/greentest/test__socket_close.py

 import gevent
 from gevent import socket
 from gevent import server
-import greentest
+import gevent.testing as greentest
 
 # XXX also test: send, sendall, recvfrom, recvfrom_into, sendto
 

src/greentest/test__socket_dns.py

@@ -6,15 +6,15 @@ from gevent import monkey
 
 import os
 import re
-import greentest
+import gevent.testing as greentest
 import unittest
 import socket
 from time import time
 import traceback
 import gevent.socket as gevent_socket
-from greentest.util import log
-from greentest import six
-from greentest.six import xrange
+from gevent.testing.util import log
+from gevent.testing import six
+from gevent.testing.six import xrange
 
 
 resolver = gevent.get_hub().resolver
@@ -23,10 +23,10 @@ log('Resolver: %s', resolver)
 if getattr(resolver, 'pool', None) is not None:
     resolver.pool.size = 1
 
-from greentest.sysinfo import RESOLVER_NOT_SYSTEM
-from greentest.sysinfo import RESOLVER_DNSPYTHON
-from greentest.sysinfo import PY2
-import greentest.timing
+from gevent.testing.sysinfo import RESOLVER_NOT_SYSTEM
+from gevent.testing.sysinfo import RESOLVER_DNSPYTHON
+from gevent.testing.sysinfo import PY2
+import gevent.testing.timing
 
 
 assert gevent_socket.gaierror is socket.gaierror
@@ -574,7 +574,7 @@ add(TestInternational, u'президент.рф', 'russian',
 add(TestInternational, u'президент.рф'.encode('idna'), 'idna')
 
 
-class TestInterrupted_gethostbyname(greentest.timing.AbstractGenericWaitTestCase):
+class TestInterrupted_gethostbyname(gevent.testing.timing.AbstractGenericWaitTestCase):
 
     # There are refs to a Waiter in the C code that don't go
     # away yet; one gc may or may not do it.

src/greentest/test__socket_dns6.py

 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import greentest
+import gevent.testing as greentest
 import socket
 from test__socket_dns import TestCase, add
 
-from greentest.sysinfo import RESOLVER_NOT_SYSTEM
-from greentest.sysinfo import RESOLVER_DNSPYTHON
+from gevent.testing.sysinfo import RESOLVER_NOT_SYSTEM
+from gevent.testing.sysinfo import RESOLVER_DNSPYTHON
 
 if not greentest.RUNNING_ON_CI and not RESOLVER_DNSPYTHON:
 

src/greentest/test__socket_errors.py

@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import greentest
+import gevent.testing as greentest
 from gevent.socket import socket, error
 
 try:

src/greentest/test__socket_ex.py

-import greentest
+import gevent.testing as greentest
 from gevent import socket
 import errno
 import sys

src/greentest/test__socket_ssl.py

 #!/usr/bin/python
 from gevent import monkey; monkey.patch_all()
 import sys
-import greentest
+import gevent.testing as greentest
 try:
     import httplib
 except ImportError:

src/greentest/test__socket_timeout.py

 import gevent
 from gevent import socket
-import greentest
+import gevent.testing as greentest
 
 
 class Test(greentest.TestCase):

src/greentest/test__ssl.py

@@ -2,7 +2,7 @@ from gevent import monkey; monkey.patch_all()
 import os
 
 import socket
-import greentest
+import gevent.testing as greentest
 # Be careful not to have TestTCP as a bare attribute in this module,
 # even aliased, to avoid running duplicate tests
 import test__socket

src/greentest/test__subprocess.py

@@ -7,9 +7,9 @@ import time
 import gc
 import tempfile
 
-import greentest
+import gevent.testing as greentest
 import gevent
-from greentest import mock
+from gevent.testing import mock
 from gevent import subprocess
 
 if not hasattr(subprocess, 'mswindows'):

src/greentest/test__subprocess_poll.py

 import sys
 from gevent.subprocess import Popen
-from greentest.util import alarm
+from gevent.testing.util import alarm
 
 alarm(3)
 

src/greentest/test__systemerror.py

 import sys
-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent.hub import get_hub
 

src/greentest/test__threading.py

@@ -5,7 +5,7 @@ import gevent.hub
 assert gevent.hub._get_hub() is None, 'monkey.patch_all() should not init hub'
 
 import gevent
-import greentest
+import gevent.testing as greentest
 import threading
 
 

src/greentest/test__threading_before_monkey.py

@@ -5,7 +5,7 @@ import threading
 from gevent import monkey
 monkey.patch_all()
 
-import greentest
+import gevent.testing as greentest
 
 
 class Test(greentest.TestCase):

src/greentest/test__threading_monkey_in_thread.py

@@ -3,7 +3,7 @@ from __future__ import print_function
 import sys
 import threading
 from gevent import monkey
-import greentest
+import gevent.testing as greentest
 
 
 class Test(greentest.TestCase):

src/greentest/test__threading_native_before_monkey.py

@@ -6,7 +6,7 @@
 import threading
 from time import sleep as time_sleep
 
-import greentest
+import gevent.testing as greentest
 
 class NativeThread(threading.Thread):
     do_run = True

src/greentest/test__threading_vs_settrace.py

@@ -3,7 +3,7 @@ import sys
 import subprocess
 import unittest
 from gevent.thread import allocate_lock
-import greentest
+import gevent.testing as greentest
 
 script = """
 from gevent import monkey

src/greentest/test__threadpool.py

@@ -6,13 +6,13 @@ import random
 import weakref
 import gc
 
-import greentest
+import gevent.testing as greentest
 import gevent.threadpool
 from gevent.threadpool import ThreadPool
 import gevent
 
-from greentest import ExpectedException
-from greentest import PYPY
+from gevent.testing import ExpectedException
+from gevent.testing import PYPY
 
 
 

src/greentest/test__threadpool_executor_patched.py

 from __future__ import print_function
 from gevent import monkey; monkey.patch_all()
 
-import greentest
+import gevent.testing as greentest
 import gevent.threadpool
 
 

src/greentest/test__timeout.py

-import greentest
+import gevent.testing as greentest
 import gevent
 from gevent.hub import get_hub
 import sys

src/greentest/test__util.py

@@ -9,7 +9,7 @@ from __future__ import print_function
 import gc
 import unittest
 
-import greentest
+import gevent.testing as greentest
 
 import gevent
 from gevent import util

src/greentest/test_hub_join_timeout.py

@@ -3,7 +3,7 @@ import gevent
 import gevent.core
 from gevent.event import Event
 from time import time
-from greentest.six import xrange
+from gevent.testing.six import xrange
 
 
 SMALL = 0.1
@@ -12,7 +12,7 @@ FUZZY = SMALL / 2
 # setting up signal does not affect join()
 gevent.signal(1, lambda: None)  # wouldn't work on windows
 
-from greentest import EXPECT_POOR_TIMER_RESOLUTION
+from gevent.testing import EXPECT_POOR_TIMER_RESOLUTION
 EXPECT_POOR_TIMER_RESOLUTION = EXPECT_POOR_TIMER_RESOLUTION or hasattr(gevent.core, 'libuv')
 # We observe longer/jittery timeouts running on appveyor or running with libuv
 

src/greentest/test_threading_2.py

 # testing gevent's Event, Lock, RLock, Semaphore, BoundedSemaphore with standard test_threading
 from __future__ import print_function
-from greentest.six import xrange
-import greentest
+from gevent.testing.six import xrange
+import gevent.testing as greentest
 
 setup_ = '''from gevent import monkey; monkey.patch_all()
 from gevent.event import Event

src/greentest/testrunner.py

@@ -2,5 +2,5 @@
 from __future__ import print_function, absolute_import, division
 
 if __name__ == '__main__':
-    from greentest import testrunner
+    from gevent.testing import testrunner
     testrunner.main()