From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 16 May 2023 02:47:51 +0000 (-0700)
Subject: [3.11] gh-104461: Run tkinter test_configure_screen on X11 only (GH-104526)
X-Git-Tag: v3.11.4~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7779027084d57ae4892a25a6d5429feb205a237c;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-104461: Run tkinter test_configure_screen on X11 only (GH-104526)

Co-authored-by: Christopher Chavez <chrischavez@gmx.us>
---

diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index a756276ec769..f0149153512f 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -77,6 +77,8 @@ class ToplevelTest(AbstractToplevelTest, unittest.TestCase):
 
     def test_configure_screen(self):
         widget = self.create()
+        if widget._windowingsystem != 'x11':
+            self.skipTest('Not using Tk for X11')
         self.assertEqual(widget['screen'], '')
         try:
             display = os.environ['DISPLAY']
diff --git a/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst
new file mode 100644
index 000000000000..ae69f623e945
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst
@@ -0,0 +1,3 @@
+Run test_configure_screen on X11 only, since the ``DISPLAY``
+environment variable and ``-screen`` option for toplevels
+are not useful on Tk for Win32 or Aqua.