Issue #18604: Consolidated checks for GUI availability.
test_support._is_gui_available is now defined the same way on every
platform, and now includes the Windows-specific check that had been in the
Windows version of _is_gui_available and the OSX-specific check that was
in runtktests.check_tk_availability. Also, every platform checks whether
Tk can be instantiated (if the platform-specific checks passed).
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index 8625db2..56eef47 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -1,8 +1,9 @@
import os
from test import test_support
-# Skip test if _tkinter wasn't built.
+# Skip test if _tkinter wasn't built or gui resource is not available.
test_support.import_module('_tkinter')
+test_support.requires('gui')
this_dir = os.path.dirname(os.path.abspath(__file__))
lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir,
@@ -11,9 +12,6 @@
with test_support.DirsOnSysPath(lib_tk_test):
import runtktests
-# Skip test if tk cannot be initialized.
-runtktests.check_tk_availability()
-
def test_main(enable_gui=False):
if enable_gui:
if test_support.use_resources is None: