Issue #22770: merge from 3.4

2 files changed, 4 insertions, 3 deletions

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index adebedd..a64ed56 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -461,12 +461,11 @@ def _is_gui_available():
                 reason = "cannot run without OS X gui process"
 
     # check on every platform whether tkinter can actually do anything
-    # but skip the test on OS X because it can cause segfaults in Cocoa Tk
-    # when running regrtest with the -j option (multiple threads/subprocesses)
-    if (not reason) and (sys.platform != 'darwin'):
+    if not reason:
         try:
             from tkinter import Tk
             root = Tk()
+            root.update()
             root.destroy()
         except Exception as e:
             err_string = str(e)
diff --git a/Misc/NEWS b/Misc/NEWS
index c47b3ff..3f62b97 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1342,6 +1342,8 @@ Tests
 - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
   copy of libz exists in $HOME/lib or /usr/local/lib.
 
+- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
+
 Tools/Demos
 -----------