diff options
| author | Ned Deily <nad@acm.org> | 2011-07-04 04:56:48 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-07-04 04:56:48 (GMT) |
| commit | 4143535d865b103ebe6cbce51287a63f9538afd3 (patch) | |
| tree | 7251878d75847b33ddeb842a64df918d25b99aaf /Lib/test/test_tk.py | |
| parent | 9ebe08d2f6c3b8bca5148e909cc89efeb7a01ad1 (diff) | |
| download | cpython-4143535d865b103ebe6cbce51287a63f9538afd3.zip cpython-4143535d865b103ebe6cbce51287a63f9538afd3.tar.gz cpython-4143535d865b103ebe6cbce51287a63f9538afd3.tar.bz2 | |
Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run
test_tk or test_ttk_guionly under a username that is not currently logged
in to the console windowserver (as may be the case under buildbot or ssh).
Diffstat (limited to 'Lib/test/test_tk.py')
| -rw-r--r-- | Lib/test/test_tk.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py index ab979fa..f993c53 100644 --- a/Lib/test/test_tk.py +++ b/Lib/test/test_tk.py @@ -2,15 +2,11 @@ from test import support # Skip test if _tkinter wasn't built. support.import_module('_tkinter') -import tkinter -from tkinter.test import runtktests -import unittest +# Skip test if tk cannot be initialized. +from tkinter.test.support import check_tk_availability +check_tk_availability() -try: - tkinter.Button() -except tkinter.TclError as msg: - # assuming tk is not available - raise unittest.SkipTest("tk not available: %s" % msg) +from tkinter.test import runtktests def test_main(enable_gui=False): if enable_gui: |