Patcherized threading and its test, removing a ton of copy-and-pasted code in the process. :-)

1 files changed, 13 insertions, 11 deletions

diff --git a/tests/stdlib/test_threading.py b/tests/stdlib/test_threading.py
index 5fcc4b4..1b87e32 100644
--- a/tests/stdlib/test_threading.py
+++ b/tests/stdlib/test_threading.py
@@ -1,20 +1,22 @@
-# Very rudimentary test of threading module
-
+from eventlet import patcher
 from eventlet.green import threading
 from eventlet.green import thread
 from eventlet.green import time
 
-# need to override these modules before import so
-# that classes inheriting from threading.Thread refer
-# to the correct parent class
-import sys
-sys.modules['threading'] = threading
+# *NOTE: doesn't test as much of the threading api as we'd like because many of
+# the tests are launched via subprocess and therefore don't get patched
+
+patcher.inject('test.test_threading',
+    globals(),
+    ('threading', threading),
+    ('thread', thread),
+    ('time', time))
 
-from test import test_threading
-test_threading.thread = thread
-test_threading.time = time
+# "PyThreadState_SetAsyncExc() is a CPython-only gimmick, not (currently)
+# exposed at the Python level.  This test relies on ctypes to get at it."
+# Therefore it's also disabled when testing eventlet, as it's not emulated.
+ThreadTests.test_PyThreadState_SetAsyncExc = lambda s: None
 
-from test.test_threading import *
 
 if __name__ == "__main__":
     test_main()
\ No newline at end of file