cpython: 968f6094788b (original) (raw)
Mercurial > cpython
changeset 83969:968f6094788b 3.3
Issue #15392: Do not run tests if threading/_thread not available. Otherwise touchup test_idle. Rename README.txt. [#15392]
| Terry Jan Reedy tjreedy@udel.edu | |
|---|---|
| date | Tue, 28 May 2013 22:21:53 -0400 |
| parents | 75432fb6b9af |
| children | 7a6a8a003553 30128355f53b |
| files | Lib/idlelib/idle_test/@README.txt Lib/idlelib/idle_test/README.txt Lib/test/test_idle.py |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-)[+] [-] Lib/idlelib/idle_test/@README.txt => Lib/idlelib/idle_test/README.txt 0 Lib/test/test_idle.py 16 |
line wrap: on
line diff
rename from Lib/idlelib/idle_test/@README.txt rename to Lib/idlelib/idle_test/README.txt
--- 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