Workaround by Tim Peters to skip this test if run from test.autotest,

in which case it will hang because the import lock is already held
by the main thread.

1 files changed, 5 insertions, 1 deletions

diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index fafb8737de4..1e1c55321f9 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -6,7 +6,7 @@
 # randrange, and then Python hangs.
 
 import thread
-from test_support import verbose
+from test_support import verbose, TestSkipped
 
 critical_section = thread.allocate_lock()
 done = thread.allocate_lock()
@@ -32,6 +32,10 @@ def task():
 
 def test_main():        # magic name!  see above
     global N, done
+    import sys
+    for modname in sys.modules:
+        if modname.find('autotest') >= 0:
+            raise TestSkipped("can't run from autotest")
     done.acquire()
     for N in (20, 50) * 3:
         if verbose: