]> granicus.if.org Git - python/commitdiff
bpo-27313: Avoid test_ttk_guionly ComboboxTest fail with macOS Cocoa Tk (GH-12011)
authorNed Deily <nad@python.org>
Sun, 24 Feb 2019 07:28:24 +0000 (02:28 -0500)
committerGitHub <noreply@github.com>
Sun, 24 Feb 2019 07:28:24 +0000 (02:28 -0500)
Lib/tkinter/test/test_ttk/test_widgets.py
Misc/NEWS.d/next/Tests/2019-02-24-01-58-38.bpo-27313.Sj9veH.rst [new file with mode: 0644]

index 5b0e29cdccaf4fe3fe1e7b6a7687fdc6f19b2d4d..69e4b3ffa17fe13ea475ed6f77d731b649776661 100644 (file)
@@ -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 (file)
index 0000000..189b9cf
--- /dev/null
@@ -0,0 +1 @@
+Avoid test_ttk_guionly ComboboxTest failure with macOS Cocoa Tk.