summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-06-21 11:43:15 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-06-21 11:43:15 (GMT)
commit1a2d134e31c3f4ae5d2fdf1fda1557149248acd2 (patch)
tree8e1679b5befba7113aa474a1a36cdb3d39769234
parent66dc4648fcca725bc48b0c8d7030c107dfeda709 (diff)
parentac803cd2f3a4a3f60c2fa511ef0b22a6dabe5dec (diff)
downloadcpython-1a2d134e31c3f4ae5d2fdf1fda1557149248acd2.zip
cpython-1a2d134e31c3f4ae5d2fdf1fda1557149248acd2.tar.gz
cpython-1a2d134e31c3f4ae5d2fdf1fda1557149248acd2.tar.bz2
Issue #24408: Fixed test for tkinter.Font on OS X.
Based on patch by Martin Panter.
-rw-r--r--Lib/tkinter/test/test_tkinter/test_font.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/tkinter/test/test_tkinter/test_font.py
index ba3b9da..25b5913 100644
--- a/Lib/tkinter/test/test_tkinter/test_font.py
+++ b/Lib/tkinter/test/test_tkinter/test_font.py
@@ -75,10 +75,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, )