Backed out changeset: 23b0164b9c82 #18441 not working

diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
index 3a0705b943c34a4dc5bee416036438e13e456450..904ace76d111275ece338677cdf1515727cfff0c 100644 (file)
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -216,7 +216,10 @@ class TkTextTest(TextTest, unittest.TestCase):
         requires('gui')
         from Tkinter import Tk, Text
         cls.Text = Text
-        cls.root = Tk()
+        try:
+            cls.root = Tk()
+        except TclError as msg:
+            raise unittest.SkipTest('TclError: %s' % msg)
 
     @classmethod
     def tearDownClass(cls):

diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
index 540f7d20643274b07d63101b31dc8973efb04c48..4262aa3f679fdecfa99bc27a09dce0ea8ce15a7a 100644 (file)
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -1,21 +1,9 @@
-# Skip test if _thread or _tkinter wasn't built or idlelib was deleted.
-from test.test_support import import_module, use_resources
-import_module('threading')  # imported by idlelib.PyShell, imports _thread
-tk = import_module('Tkinter')
+# Skip test if _tkinter or _thread wasn't built or idlelib was deleted.
+from test.test_support import import_module
+import_module('Tkinter')
+import_module('threading')  # imported by PyShell, imports _thread
 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:
-        root = tk.Tk()
-        root.destroy()
-    except TclError:
-        while True:
-            use_resources.delete('gui')
-            if 'gui' not in use_resources:
-                break
-
 # 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.)