summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-05-16 02:47:51 (GMT)
committerGitHub <noreply@github.com>2023-05-16 02:47:51 (GMT)
commit7779027084d57ae4892a25a6d5429feb205a237c (patch)
treee4de80f553bb8586d013c69b5ff6aa77e572637f
parenta712c5f42d5904e1a1cdaf11bd1f05852cfdd830 (diff)
downloadcpython-7779027084d57ae4892a25a6d5429feb205a237c.zip
cpython-7779027084d57ae4892a25a6d5429feb205a237c.tar.gz
cpython-7779027084d57ae4892a25a6d5429feb205a237c.tar.bz2
[3.11] gh-104461: Run tkinter test_configure_screen on X11 only (GH-104526)
Co-authored-by: Christopher Chavez <chrischavez@gmx.us>
-rw-r--r--Lib/tkinter/test/test_tkinter/test_widgets.py2
-rw-r--r--Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst3
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index a756276..f014915 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 0000000..ae69f62
--- /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.