diff options
Diffstat (limited to 'Lib/test/test_idle.py')
| -rw-r--r-- | Lib/test/test_idle.py | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py index 7770ee5..132657b 100644 --- a/Lib/test/test_idle.py +++ b/Lib/test/test_idle.py @@ -1,23 +1,13 @@ import unittest -from test import support -from test.support import import_module, use_resources +from test.support import import_module, import_fresh_module # Skip test if _thread or _tkinter wasn't built or idlelib was deleted. import_module('threading') # imported by PyShell, imports _thread tk = import_module('tkinter') # imports _tkinter idletest = import_module('idlelib.idle_test') - -# If buildbot improperly sets gui resource (#18365, #18441), remove it -# so requires('gui') tests are skipped while non-gui tests still run. -# If there is a problem with Macs, see #18441, msg 193805 -if use_resources and 'gui' in use_resources: - try: - root = tk.Tk() - root.destroy() - del root - except tk.TclError: - while 'gui' in use_resources: - use_resources.remove('gui') +# Make sure TCL_LIBRARY is set properly on Windows. Note that this will +# cause a warning about test_idle modifying the environment +import_fresh_module('tkinter._fix') # Without test_main present, regrtest.runtest_inner (line1219) calls # unittest.TestLoader().loadTestsFromModule(this_module) which calls @@ -25,8 +15,4 @@ if use_resources and 'gui' in use_resources: load_tests = idletest.load_tests if __name__ == '__main__': - # Until unittest supports resources, we emulate regrtest's -ugui - # so loaded tests run the same as if textually present here. - # If any Idle test ever needs another resource, add it to the list. - support.use_resources = ['gui'] # use_resources is initially None unittest.main(verbosity=2, exit=False) |