]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-27313: Avoid test_ttk_guionly ComboboxTest fail with macOS Cocoa Tk (GH-12011...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 24 Feb 2019 07:56:12 +0000 (23:56 -0800)
committerNed Deily <nad@python.org>
Sun, 24 Feb 2019 07:56:12 +0000 (02:56 -0500)
(cherry picked from commit aeca373b339e0ea9739536ce6b43bd90f3b89873)

Co-authored-by: Ned Deily <nad@python.org>
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 cb991931853a09f73d888b5b4f4df31f1c2225fc..13e0568620185ddebc4ffba0a5b85f989973622a 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.