]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #24408: Fixed test for tkinter.Font on OS X.
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 21 Jun 2015 11:41:36 +0000 (14:41 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 21 Jun 2015 11:41:36 +0000 (14:41 +0300)
Based on patch by Martin Panter.

Lib/lib-tk/test/test_tkinter/test_font.py

index 57810d84bcf595473eb71020bfdaa9bbdbb37d1e..cb30f054be291651d5e05e7eaff80ac8445ca218 100644 (file)
@@ -76,10 +76,19 @@ class FontTest(AbstractTkTest, unittest.TestCase):
 
     def test_families(self):
         families = font.families(self.root)
-        self.assertIn(self.font.actual('family'), families)
+        self.assertIsInstance(families, tuple)
+        self.assertTrue(families)
+        for family in families:
+            self.assertIsInstance(family, str)
+            self.assertTrue(family)
 
     def test_names(self):
         names = font.names(self.root)
+        self.assertIsInstance(names, tuple)
+        self.assertTrue(names)
+        for name in names:
+            self.assertIsInstance(name, str)
+            self.assertTrue(name)
         self.assertIn(fontname, names)
 
 tests_gui = (FontTest, )