summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2019-02-24 07:28:24 (GMT)
committerGitHub <noreply@github.com>2019-02-24 07:28:24 (GMT)
commitaeca373b339e0ea9739536ce6b43bd90f3b89873 (patch)
tree3ff3ae4432d008d0ea23336f31ebc421850b6d64 /Lib/tkinter
parent79fbcc597dfd039d3261fffcb519b5ec5a18df9d (diff)
downloadcpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.zip
cpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.tar.gz
cpython-aeca373b339e0ea9739536ce6b43bd90f3b89873.tar.bz2
bpo-27313: Avoid test_ttk_guionly ComboboxTest fail with macOS Cocoa Tk (GH-12011)
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/test/test_ttk/test_widgets.py7
1 files changed, 6 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)