From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 21 Jun 2015 11:41:36 +0000 (+0300)
Subject: Issue #24408: Fixed test for tkinter.Font on OS X.
X-Git-Tag: v2.7.11rc1~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d69e0edc4c7497f92126dc105444f5ebeb39d6;p=thirdparty%2FPython%2Fcpython.git

Issue #24408: Fixed test for tkinter.Font on OS X.
Based on patch by Martin Panter.
---

diff --git a/Lib/lib-tk/test/test_tkinter/test_font.py b/Lib/lib-tk/test/test_tkinter/test_font.py
index 57810d84bcf5..cb30f054be29 100644
--- a/Lib/lib-tk/test/test_tkinter/test_font.py
+++ b/Lib/lib-tk/test/test_tkinter/test_font.py
@@ -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, )