summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-05-29 02:21:53 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-05-29 02:21:53 (GMT)
commiteb4c9c77b8257c05b40467651bdc7764295926e8 (patch)
treeb2e9c67bfadab144ab049892ac6ea0205b90fe59 /Lib
parent97345680dcf920d6def6217213499be362ed1921 (diff)
downloadcpython-eb4c9c77b8257c05b40467651bdc7764295926e8.zip
cpython-eb4c9c77b8257c05b40467651bdc7764295926e8.tar.gz
cpython-eb4c9c77b8257c05b40467651bdc7764295926e8.tar.bz2
Issue #15392: Do not run tests if threading/_thread not available. Otherwise
touchup test_idle. Rename README.txt.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/idle_test/README.txt (renamed from Lib/idlelib/idle_test/@README.txt)0
-rw-r--r--Lib/test/test_idle.py16
2 files changed, 8 insertions, 8 deletions
diff --git a/Lib/idlelib/idle_test/@README.txt b/Lib/idlelib/idle_test/README.txt
index f6797c6..f6797c6 100644
--- a/Lib/idlelib/idle_test/@README.txt
+++ b/Lib/idlelib/idle_test/README.txt
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
index 1c18280..1acd676 100644
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -1,13 +1,13 @@
-# Skip test if tkinter wasn't built or idlelib was deleted.
+# Skip test if _tkinter or _thread wasn't built or idlelib was deleted.
from test.support import import_module
-import_module('tkinter') # discard return
-itdir = import_module('idlelib.idle_test')
+import_module('tkinter')
+import_module('threading') # imported by PyShell, imports _thread
+idletest = import_module('idlelib.idle_test')
-# Without test_main present, regrtest.runtest_inner (line1219)
-# imitates unittest.main by calling
-# unittest.TestLoader().loadTestsFromModule(this_module)
-# which look for load_tests and uses it if found.
-load_tests = itdir.load_tests
+# Without test_main present, regrtest.runtest_inner (line1219) calls
+# unittest.TestLoader().loadTestsFromModule(this_module) which calls
+# load_tests() if it finds it. (Unittest.main does the same.)
+load_tests = idletest.load_tests
if __name__ == '__main__':
import unittest