[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test

[serhiy.storchaka]

https://hg.python.org/cpython/rev/db168611c6c8
changeset:   99043:db168611c6c8
branch:      3.5
parent:      99040:330cec28f6ff
parent:      99042:385b3aaf8401
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Nov 10 15:31:38 2015 +0200
summary:
  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.

files:
  Lib/tkinter/test/support.py                |  2 +-
  Lib/tkinter/test/test_tkinter/test_font.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py
--- a/Lib/tkinter/test/support.py
+++ b/Lib/tkinter/test/support.py
@@ -23,7 +23,7 @@
     def tearDownClass(cls):
         cls.root.update_idletasks()
         cls.root.destroy()
-        cls.root = None
+        del cls.root
         tkinter._default_root = None
         tkinter._support_default_root = cls._old_support_default_root
 
diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/tkinter/test/test_tkinter/test_font.py
--- a/Lib/tkinter/test/test_tkinter/test_font.py
+++ b/Lib/tkinter/test/test_tkinter/test_font.py
@@ -12,7 +12,7 @@
 
     @classmethod
     def setUpClass(cls):
-        AbstractTkTest.setUpClass()
+        AbstractTkTest.setUpClass.__func__(cls)
         try:
             cls.font = font.Font(root=cls.root, name=fontname, exists=True)
         except tkinter.TclError:

-- 
Repository URL: https://hg.python.org/cpython