Commit 5f30f793 authored by Terry Jan Reedy's avatar Terry Jan Reedy

Issue #27922: IDLE tests no longer flash tk widgets (Merge 3.5).

parents a3623c86 00b1e0f7
......@@ -14,6 +14,7 @@ class GetKeysTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.root = Tk()
cls.root.withdraw()
@classmethod
def tearDownClass(cls):
......
......@@ -14,6 +14,7 @@ class ConfigDialogTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.root = Tk()
cls.root.withdraw()
@classmethod
def tearDownClass(cls):
......
......@@ -17,6 +17,7 @@ class PasteTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.root = root = tk.Tk()
cls.root.withdraw()
pyshell.fix_x11_paste(root)
cls.text = tk.Text(root)
cls.entry = tk.Entry(root)
......
......@@ -68,6 +68,7 @@ class FetchTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = tk.Tk()
cls.root.withdraw()
def setUp(self):
self.text = text = TextWrapper(self.root)
......
......@@ -37,6 +37,7 @@ class HyperParserTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
cls.text = Text(cls.root)
cls.editwin = DummyEditwin(cls.text)
......
......@@ -22,6 +22,7 @@ class InitTktypeTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = tk.Tk()
cls.root.withdraw()
cls.orig_platform = macosx.platform
@classmethod
......@@ -76,6 +77,7 @@ class SetupTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = tk.Tk()
cls.root.withdraw()
@classmethod
def tearDownClass(cls):
......
......@@ -252,6 +252,7 @@ class QueryGuiTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = root = Tk()
cls.root.withdraw()
cls.dialog = query.Query(root, 'TEST', 'test', _utest=True)
cls.dialog.destroy = mock.Mock()
......@@ -295,6 +296,7 @@ class SectionnameGuiTest(unittest.TestCase):
def test_click_section_name(self):
root = Tk()
root.withdraw()
dialog = query.SectionName(root, 'T', 't', {'abc'}, _utest=True)
Equal = self.assertEqual
self.assertEqual(dialog.used_names, {'abc'})
......@@ -314,6 +316,7 @@ class ModulenameGuiTest(unittest.TestCase):
def test_click_module_name(self):
root = Tk()
root.withdraw()
dialog = query.ModuleName(root, 'T', 't', 'idlelib', _utest=True)
self.assertEqual(dialog.text0, 'idlelib')
self.assertEqual(dialog.entry.get(), 'idlelib')
......@@ -332,6 +335,7 @@ class HelpsourceGuiTest(unittest.TestCase):
def test_click_help_source(self):
root = Tk()
root.withdraw()
dialog = query.HelpSource(root, 'T', menuitem='__test__',
filepath=__file__, _utest=True)
Equal = self.assertEqual
......
......@@ -15,6 +15,7 @@ class InitCloseTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
cls.text = Text(cls.root)
@classmethod
......@@ -44,6 +45,7 @@ class WidgetRedirectorTest(unittest.TestCase):
def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
cls.text = Text(cls.root)
@classmethod
......
......@@ -20,15 +20,16 @@ from idlelib.idle_test.mock_tk import Mbox_func
def setUpModule():
global root
root = Tk()
root.withdraw()
def tearDownModule():
global root
root.update_idletasks()
root.destroy() # pyflakes falsely sees root as undefined
root.destroy() # Pyflakes falsely sees root as undefined.
del root
class TV(tv.TextViewer): # used by TextViewTest
class TV(tv.TextViewer): # Used in TextViewTest.
transient = Func()
grab_set = Func()
wait_window = Func()
......@@ -59,8 +60,8 @@ class TextViewTest(unittest.TestCase):
view.destroy = Func()
view.Ok()
self.assertTrue(view.destroy.called)
del view.destroy # unmask real function
view.destroy
del view.destroy # Unmask real function.
view.destroy()
class ViewFunctionTest(unittest.TestCase):
......@@ -76,9 +77,10 @@ class ViewFunctionTest(unittest.TestCase):
del cls.orig_error
def test_view_text(self):
# If modal True, tkinter will error with 'can't invoke "event" command'
# If modal True, get tk error 'can't invoke "event" command'.
view = tv.view_text(root, 'Title', 'test text', modal=False)
self.assertIsInstance(view, tv.TextViewer)
view.Ok()
def test_view_file(self):
test_dir = os.path.dirname(__file__)
......@@ -88,7 +90,7 @@ class ViewFunctionTest(unittest.TestCase):
self.assertIn('Test', view.textView.get('1.0', '1.end'))
view.Ok()
# Mock showerror will be used and view_file will return None
# Mock showerror will be used; view_file will return None.
testfile = os.path.join(test_dir, '../notthere.py')
view = tv.view_file(root, 'Title', testfile, modal=False)
self.assertIsNone(view)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment