From d71244f1897199e6eba04d37a52b0bee78110944 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sat, 27 Jul 2013 22:06:03 -0400 Subject: Issue #18441: add Mac (darwin) gui check. This is not needed today, but has been in the past and might be needed again in the future --- Lib/test/test_idle.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py index fc05be1..77f6b1d 100644 --- a/Lib/test/test_idle.py +++ b/Lib/test/test_idle.py @@ -1,14 +1,24 @@ -# Skip test if _thread or _tkinter wasn't built or idlelib was deleted. +import unittest from test import test_support as support from test.test_support import import_module, use_resources + +# Skip test if _thread or _tkinter wasn't built or idlelib was deleted. import_module('threading') # imported by idlelib.PyShell, imports _thread -tk = import_module('Tkinter') +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 use_resources and 'gui' in use_resources: try: + import sys + if sys.platform == 'darwin': + from lib-tk.test.runtktests import check_tk_availability + # tkinter.test.suppport in 3.x + try: + check_tk_availability() + except unittest.SkipTest: + raise tk.TclError root = tk.Tk() root.destroy() except tk.TclError: @@ -25,5 +35,4 @@ if __name__ == '__main__': # 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 - import unittest unittest.main(verbosity=2, exit=False) -- cgit v0.12