diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-02-24 07:56:12 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2019-02-24 07:56:12 (GMT) |
| commit | 1dee4565fae9ccb54719fa99d7944c148736083a (patch) | |
| tree | 3b6cbb2919c89a7b1d4fd7eb53a07d25c45f8b76 | |
| parent | 2a3af94b7e4d7851986043348128e312ddbb2451 (diff) | |
| download | cpython-1dee4565fae9ccb54719fa99d7944c148736083a.zip cpython-1dee4565fae9ccb54719fa99d7944c148736083a.tar.gz cpython-1dee4565fae9ccb54719fa99d7944c148736083a.tar.bz2 | |
bpo-27313: Avoid test_ttk_guionly ComboboxTest fail with macOS Cocoa Tk (GH-12011) (GH-12013)
(cherry picked from commit aeca373b339e0ea9739536ce6b43bd90f3b89873)
Co-authored-by: Ned Deily <nad@python.org>
| -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 cb99193..13e0568 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. |