summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-06-21 11:42:57 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-06-21 11:42:57 (GMT)
commitac803cd2f3a4a3f60c2fa511ef0b22a6dabe5dec (patch)
treeab377bd3f3d6bbc54cf9f718bed0de691eeda68f /Lib/tkinter
parent6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940 (diff)
parent753a1dfcc216ad580cfdac6723c381a7bfc72e99 (diff)
downloadcpython-ac803cd2f3a4a3f60c2fa511ef0b22a6dabe5dec.zip
cpython-ac803cd2f3a4a3f60c2fa511ef0b22a6dabe5dec.tar.gz
cpython-ac803cd2f3a4a3f60c2fa511ef0b22a6dabe5dec.tar.bz2
Issue #24408: Fixed test for tkinter.Font on OS X.
Based on patch by Martin Panter.
Diffstat (limited to 'Lib/tkinter')
-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, )