diff options
| author | Ned Deily <nad@python.org> | 2019-02-24 07:28:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-24 07:28:24 (GMT) |
| commit | aeca373b339e0ea9739536ce6b43bd90f3b89873 (patch) | |
| tree | 3ff3ae4432d008d0ea23336f31ebc421850b6d64 | |
| parent | 79fbcc597dfd039d3261fffcb519b5ec5a18df9d (diff) | |
| download | cpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.zip cpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.tar.gz cpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.tar.bz2 | |
bpo-27313: Avoid test_ttk_guionly ComboboxTest fail with macOS Cocoa Tk (GH-12011)
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2019-02-24-01-58-38.bpo-27313.Sj9veH.rst | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 5b0e29c..69e4b3f 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -329,7 +329,12 @@ class EntryTest(AbstractWidgetTest, unittest.TestCase): self.entry.wait_visibility() self.entry.update_idletasks() - self.assertEqual(self.entry.identify(5, 5), "textarea") + # bpo-27313: macOS Cocoa widget differs from X, allow either + if sys.platform == 'darwin': + self.assertIn(self.entry.identify(5, 5), + ("textarea", "Combobox.button") ) + else: + self.assertEqual(self.entry.identify(5, 5), "textarea") self.assertEqual(self.entry.identify(-1, -1), "") self.assertRaises(tkinter.TclError, self.entry.identify, None, 5) diff --git a/Misc/NEWS.d/next/Tests/2019-02-24-01-58-38.bpo-27313.Sj9veH.rst b/Misc/NEWS.d/next/Tests/2019-02-24-01-58-38.bpo-27313.Sj9veH.rst new file mode 100644 index 0000000..189b9cf --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-02-24-01-58-38.bpo-27313.Sj9veH.rst @@ -0,0 +1 @@ +Avoid test_ttk_guionly ComboboxTest failure with macOS Cocoa Tk. |