Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test 

failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.
This commit is contained in:
Serhiy Storchaka 2015-11-10 15:31:38 +02:00
parent c379ade1bb 40fe35a95e
commit e46e09d0f5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/tkinter/test/support.py
View File

@ -23,7 +23,7 @@ class AbstractTkTest:
def tearDownClass(cls): def tearDownClass(cls):
cls.root.update_idletasks() cls.root.update_idletasks()
cls.root.destroy() cls.root.destroy()
cls.root = None del cls.root
tkinter._default_root = None tkinter._default_root = None
tkinter._support_default_root = cls._old_support_default_root tkinter._support_default_root = cls._old_support_default_root

2
Lib/tkinter/test/test_tkinter/test_font.py
View File

@ -12,7 +12,7 @@ class FontTest(AbstractTkTest, unittest.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
AbstractTkTest.setUpClass() AbstractTkTest.setUpClass.__func__(cls)
try: try:
cls.font = font.Font(root=cls.root, name=fontname, exists=True) cls.font = font.Font(root=cls.root, name=fontname, exists=True)
except tkinter.TclError: except tkinter.TclError: