4 files changed, 7 insertions, 36 deletions
diff --git a/tests/stdlib/all.py b/tests/stdlib/all.py
index 3d05d1e..23df5b2 100644
--- a/tests/stdlib/all.py
+++ b/tests/stdlib/all.py
@@ -10,18 +10,16 @@ Many of these tests make connections to external servers, and all.py tries to sk
 tests rather than failing them, so you can get some work done on a plane.
 """
 
-from eventlet import debug
-debug.hub_prevent_multiple_readers(False)
+import eventlet.hubs
+import eventlet.debug
+eventlet.debug.hub_prevent_multiple_readers(False)
 
 
 def restart_hub():
-    from eventlet import hubs
-    hub = hubs.get_hub()
-    hub_shortname = hub.__module__.split('.')[-1]
-    # don't restart the pyevent hub; it's not necessary
-    if hub_shortname != 'pyevent':
-        hub.abort()
-        hubs.use_hub(hub_shortname)
+    hub = eventlet.hubs.get_hub()
+    hub_name = hub.__module__
+    hub.abort()
+    eventlet.hubs.use_hub(hub_name)
 
 
 def assimilate_patched(name):
diff --git a/tests/stdlib/test_asyncore.py b/tests/stdlib/test_asyncore.py
index ea889aa..23f35f3 100644
--- a/tests/stdlib/test_asyncore.py
+++ b/tests/stdlib/test_asyncore.py
@@ -49,16 +49,5 @@ try:
 except NameError:
     pass
 
-try:
-    # temporarily disabling these tests in the python2.7/pyevent configuration
-    from tests import using_pyevent
-    import sys
-    if using_pyevent(None) and sys.version_info >= (2, 7):
-        TestAPI_UseSelect.test_handle_accept = lambda *a, **kw: None
-        TestAPI_UseSelect.test_handle_close = lambda *a, **kw: None
-        TestAPI_UseSelect.test_handle_read = lambda *a, **kw: None
-except NameError:
-    pass
-
 if __name__ == "__main__":
     test_main()
diff --git a/tests/stdlib/test_ftplib.py b/tests/stdlib/test_ftplib.py
index be67420..6dc2d76 100644
--- a/tests/stdlib/test_ftplib.py
+++ b/tests/stdlib/test_ftplib.py
@@ -6,11 +6,5 @@ from eventlet.green import socket
 
 patcher.inject('test.test_ftplib', globals())
 
-# this test only fails on python2.7/pyevent/--with-xunit; screw that
-try:
-    TestTLS_FTPClass.test_data_connection = lambda *a, **kw: None
-except (AttributeError, NameError):
-    pass
-
 if __name__ == "__main__":
     test_main()
diff --git a/tests/stdlib/test_socketserver.py b/tests/stdlib/test_socketserver.py
index 252a8c6..e5f5d55 100644
--- a/tests/stdlib/test_socketserver.py
+++ b/tests/stdlib/test_socketserver.py
@@ -20,15 +20,5 @@ patcher.inject(
     ('time', time),
     ('threading', threading))
 
-# only a problem with pyevent
-from eventlet import tests
-if tests.using_pyevent():
-    try:
-        SocketServerTest.test_ForkingUDPServer = lambda *a, **kw: None
-        SocketServerTest.test_ForkingTCPServer = lambda *a, **kw: None
-        SocketServerTest.test_ForkingUnixStreamServer = lambda *a, **kw: None
-    except (NameError, AttributeError):
-        pass
-
 if __name__ == "__main__":
     test_main()