changeset: 101675:813bb6a4c693 branch: 3.5 parent: 101672:883cfb3e28f9 user: Terry Jan Reedy date: Fri Jun 03 22:19:17 2016 -0400 files: Lib/idlelib/idle_test/README.txt Lib/idlelib/idle_test/test_autocomplete.py Lib/idlelib/idle_test/test_autoexpand.py Lib/idlelib/idle_test/test_formatparagraph.py Lib/idlelib/idle_test/test_percolator.py Lib/idlelib/idle_test/test_replacedialog.py Lib/idlelib/idle_test/test_textview.py Lib/idlelib/idle_test/test_undodelegator.py Lib/idlelib/idle_test/test_widgetredir.py description: Issue 20567: Revise idle_test/README.txt and some tests to match new advice. diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/README.txt --- a/Lib/idlelib/idle_test/README.txt Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/README.txt Fri Jun 03 22:19:17 2016 -0400 @@ -56,40 +56,44 @@ To guard a test class, put "requires('gui')" in its setUpClass function. -To avoid interfering with other GUI tests, all GUI objects must be -destroyed and deleted by the end of the test. Widgets, such as a Tk -root, created in a setUpX function, should be destroyed in the -corresponding tearDownX. Module and class widget attributes should also -be deleted. +To avoid interfering with other gui tests, all gui objects must be destroyed and +deleted by the end of the test. The Tk root created in a setUpX function should +be destroyed in the corresponding tearDownX and the module or class attribute +deleted. Others widgets should descend from the single root and the attributes +deleted BEFORE root is destroyed. See https://bugs.python.org/issue20567. @classmethod def setUpClass(cls): requires('gui') cls.root = tk.Tk() + cls.text = tk.Text(root) @classmethod def tearDownClass(cls): + del cls.text cls.root.destroy() del cls.root Requires('gui') causes the test(s) it guards to be skipped if any of -a few conditions are met: - +these conditions are met: + - The tests are being run by regrtest.py, and it was started without enabling the "gui" resource with the "-u" command line option. - + - The tests are being run on Windows by a service that is not allowed to interact with the graphical environment. - + + - The tests are being run on Linux and X Windows is not available. + - The tests are being run on Mac OSX in a process that cannot make a window manager connection. - + - tkinter.Tk cannot be successfully instantiated for some reason. - + - test.support.use_resources has been set by something other than regrtest.py and does not contain "gui". - + Tests of non-GUI operations should avoid creating tk widgets. Incidental uses of tk variables and messageboxes can be replaced by the mock classes in idle_test/mock_tk.py. The mock text handles some uses of the diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_autocomplete.py --- a/Lib/idlelib/idle_test/test_autocomplete.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_autocomplete.py Fri Jun 03 22:19:17 2016 -0400 @@ -33,9 +33,8 @@ @classmethod def tearDownClass(cls): + del cls.editor, cls.text cls.root.destroy() - del cls.text - del cls.editor del cls.root def setUp(self): diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_autoexpand.py --- a/Lib/idlelib/idle_test/test_autoexpand.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_autoexpand.py Fri Jun 03 22:19:17 2016 -0400 @@ -25,10 +25,10 @@ @classmethod def tearDownClass(cls): + del cls.text, cls.auto_expand if hasattr(cls, 'tk'): cls.tk.destroy() del cls.tk - del cls.text, cls.auto_expand def tearDown(self): self.text.delete('1.0', 'end') diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_formatparagraph.py --- a/Lib/idlelib/idle_test/test_formatparagraph.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_formatparagraph.py Fri Jun 03 22:19:17 2016 -0400 @@ -276,10 +276,9 @@ @classmethod def tearDownClass(cls): + del cls.text, cls.formatter 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 -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_percolator.py --- a/Lib/idlelib/idle_test/test_percolator.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_percolator.py Fri Jun 03 22:19:17 2016 -0400 @@ -40,9 +40,9 @@ @classmethod def tearDownClass(cls): - cls.text.destroy() + del cls.text cls.root.destroy() - del cls.text, cls.root + del cls.root def setUp(self): self.percolator = Percolator(self.text) diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_replacedialog.py --- a/Lib/idlelib/idle_test/test_replacedialog.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_replacedialog.py Fri Jun 03 22:19:17 2016 -0400 @@ -31,8 +31,9 @@ @classmethod def tearDownClass(cls): se.tkMessageBox = orig_mbox + del cls.text, cls.dialog, cls.engine cls.root.destroy() - del cls.text, cls.dialog, cls.engine, cls.root + del cls.root def setUp(self): self.text.insert('insert', 'This is a sample sTring') diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_textview.py --- a/Lib/idlelib/idle_test/test_textview.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_textview.py Fri Jun 03 22:19:17 2016 -0400 @@ -22,7 +22,8 @@ root = Tk() def tearDownModule(): - global root + global root, TV + del TV root.destroy() # pyflakes falsely sees root as undefined del root diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_undodelegator.py --- a/Lib/idlelib/idle_test/test_undodelegator.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_undodelegator.py Fri Jun 03 22:19:17 2016 -0400 @@ -23,8 +23,9 @@ @classmethod def tearDownClass(cls): cls.percolator.redir.close() + del cls.percolator, cls.text cls.root.destroy() - del cls.percolator, cls.text, cls.root + del cls.root def setUp(self): self.delegator = UndoDelegator() diff -r 883cfb3e28f9 -r 813bb6a4c693 Lib/idlelib/idle_test/test_widgetredir.py --- a/Lib/idlelib/idle_test/test_widgetredir.py Sat Jun 04 00:22:17 2016 +0000 +++ b/Lib/idlelib/idle_test/test_widgetredir.py Fri Jun 03 22:19:17 2016 -0400 @@ -14,14 +14,14 @@ @classmethod def setUpClass(cls): requires('gui') - cls.tk = Tk() - cls.text = Text(cls.tk) + cls.root = Tk() + cls.text = Text(cls.root) @classmethod def tearDownClass(cls): - cls.text.destroy() - cls.tk.destroy() - del cls.text, cls.tk + del cls.text + cls.root.destroy() + del cls.root def test_init(self): redir = WidgetRedirector(self.text) @@ -43,14 +43,14 @@ @classmethod def setUpClass(cls): requires('gui') - cls.tk = Tk() - cls.text = Text(cls.tk) + cls.root = Tk() + cls.text = Text(cls.root) @classmethod def tearDownClass(cls): - cls.text.destroy() - cls.tk.destroy() - del cls.text, cls.tk + del cls.text + cls.root.destroy() + del cls.root def setUp(self): self.redir = WidgetRedirector(self.text) @@ -108,13 +108,13 @@ def test_command_dispatch(self): # Test that .__init__ causes redirection of tk calls # through redir.dispatch - self.tk.call(self.text._w, 'insert', 'hello') + self.root.call(self.text._w, 'insert', 'hello') self.assertEqual(self.func.args, ('hello',)) self.assertEqual(self.text.get('1.0', 'end'), '\n') # Ensure that called through redir .dispatch and not through # self.text.insert by having mock raise TclError. self.func.__init__(TclError()) - self.assertEqual(self.tk.call(self.text._w, 'insert', 'boo'), '') + self.assertEqual(self.root.call(self.text._w, 'insert', 'boo'), '')