From c9f9554864a4281ff8a19fdd6b21bac599beee0c Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Sat, 13 May 2023 22:00:09 -0500 Subject: [PATCH 1/3] gh-104461: Run test_configure_screen on X11 only --- Lib/test/test_tkinter/test_widgets.py | 2 ++ .../Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst diff --git a/Lib/test/test_tkinter/test_widgets.py b/Lib/test/test_tkinter/test_widgets.py index ba4ef49078c5a7..b45245162f2446 100644 --- a/Lib/test/test_tkinter/test_widgets.py +++ b/Lib/test/test_tkinter/test_widgets.py @@ -76,6 +76,8 @@ def test_configure_menu(self): 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 copy.rst b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst new file mode 100644 index 00000000000000..da4e7ec25bf5f7 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.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. \ No newline at end of file From 96f1ac2644ae26e78d4284026a84fbbcc4a8fce6 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 15 May 2023 21:34:59 -0400 Subject: [PATCH 2/3] Add trailing LF to NEWS entry. --- .../Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst index da4e7ec25bf5f7..ae69f623e94558 100644 --- a/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst +++ b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst @@ -1,3 +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. \ No newline at end of file +are not useful on Tk for Win32 or Aqua. From c53fdf5a9da4db25d16e139173a98f5a75d01b9b Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 15 May 2023 21:46:19 -0400 Subject: [PATCH 3/3] Fix NEWS file name. --- ...11 copy.rst => 2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Misc/NEWS.d/next/Tests/{2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst => 2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst} (100%) diff --git a/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst b/Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst similarity index 100% rename from Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11 copy.rst rename to Misc/NEWS.d/next/Tests/2023-05-14-03-00-00.gh-issue-104461.Rmex11.rst