[Python-checkins] cpython (2.7): Issue #20567: Delete class attribute gui widgets in idle tests.

Fri Feb 28 00:48:52 CET 2014

http://hg.python.org/cpython/rev/43c4073cb2e2
changeset: 89418:43c4073cb2e2
branch: 2.7
parent: 89403:1a1a9d6fb278
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Thu Feb 27 18:47:23 2014 -0500
summary:
 Issue #20567: Delete class attribute gui widgets in idle tests.
Code patch by Serhiy Storchaka
files:
 Lib/idlelib/idle_test/README.txt | 8 +++++---
 Lib/idlelib/idle_test/test_formatparagraph.py | 3 +++
 Lib/idlelib/idle_test/test_idlehistory.py | 1 +
 Lib/idlelib/idle_test/test_searchengine.py | 3 +++
 Lib/idlelib/idle_test/test_text.py | 1 +
 Lib/test/test_idle.py | 1 +
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -41,9 +41,10 @@
 screen, gui tests must be 'guarded' by "requires('gui')" in a setUp
 function or method. This will typically be setUpClass.
 
-All gui objects must be destroyed by the end of the test, perhaps in a tearDown
-function. Creating the Tk root directly in a setUp allows a reference to be saved
-so it can be properly destroyed in the corresponding tearDown. 
+To avoid interfering with other gui tests, all gui objects must be destroyed
+and deleted by the end of the test. If a widget, such as a Tk root, is created
+in a setUpX function, destroy it in the corresponding tearDownX. For module
+and class attributes, also delete the widget.
 ---
 @classmethod
 def setUpClass(cls):
@@ -53,6 +54,7 @@
 @classmethod
 def tearDownClass(cls):
 cls.root.destroy()
+ del cls.root
 ---
 
 Support.requires('gui') returns true if it is either called in a main module
diff --git a/Lib/idlelib/idle_test/test_formatparagraph.py b/Lib/idlelib/idle_test/test_formatparagraph.py
--- a/Lib/idlelib/idle_test/test_formatparagraph.py
+++ b/Lib/idlelib/idle_test/test_formatparagraph.py
@@ -277,6 +277,9 @@
 @classmethod
 def tearDownClass(cls):
 cls.root.destroy()
+ del cls.root
+ del cls.text
+ del cls.formatter
 
 def test_short_line(self):
 self.text.insert('1.0', "Short line\n")
diff --git a/Lib/idlelib/idle_test/test_idlehistory.py b/Lib/idlelib/idle_test/test_idlehistory.py
--- a/Lib/idlelib/idle_test/test_idlehistory.py
+++ b/Lib/idlelib/idle_test/test_idlehistory.py
@@ -80,6 +80,7 @@
 @classmethod
 def tearDownClass(cls):
 cls.root.destroy()
+ del cls.root
 
 def fetch_test(self, reverse, line, prefix, index, bell=False):
 # Perform one fetch as invoked by Alt-N or Alt-P
diff --git a/Lib/idlelib/idle_test/test_searchengine.py b/Lib/idlelib/idle_test/test_searchengine.py
--- a/Lib/idlelib/idle_test/test_searchengine.py
+++ b/Lib/idlelib/idle_test/test_searchengine.py
@@ -64,6 +64,7 @@
 ## @classmethod
 ## def tearDownClass(cls):
 ## cls.root.destroy()
+## del cls.root
 
 def test_get_selection(self):
 # text = Text(master=self.root)
@@ -219,6 +220,7 @@
 ## @classmethod
 ## def tearDownClass(cls):
 ## cls.root.destroy()
+## del cls.root
 
 def test_search(self):
 Equal = self.assertEqual
@@ -261,6 +263,7 @@
 ## @classmethod
 ## def tearDownClass(cls):
 ## cls.root.destroy()
+## del cls.root
 
 @classmethod
 def setUpClass(cls):
diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -221,6 +221,7 @@
 @classmethod
 def tearDownClass(cls):
 cls.root.destroy()
+ del cls.root
 
 
 if __name__ == '__main__':
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -14,6 +14,7 @@
 try:
 root = tk.Tk()
 root.destroy()
+ del root
 except tk.TclError:
 while 'gui' in use_resources:
 use_resources.remove('gui')
-- 
Repository URL: http://hg.python.org/cpython
