diff options
author | Terry Jan Reedy <tjreedy@udel.edu> | 2016-06-22 05:49:15 -0400 |
---|---|---|
committer | Terry Jan Reedy <tjreedy@udel.edu> | 2016-06-22 05:49:15 -0400 |
commit | 09d313e9b76458db2a4f5d7a50af43711aeb7874 (patch) | |
tree | cf960eeae027b2895dc351c350798e14f2a42442 /Lib/idlelib/idle_test/test_help_about.py | |
parent | e92e9a9d667a4ef28f9fc534c55511cde32dfa75 (diff) | |
download | cpython-09d313e9b76458db2a4f5d7a50af43711aeb7874.tar.gz |
Issue #27365: Finish merge so tests pass.
Diffstat (limited to 'Lib/idlelib/idle_test/test_help_about.py')
-rw-r--r-- | Lib/idlelib/idle_test/test_help_about.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py index d0a012767a..843efb9ad2 100644 --- a/Lib/idlelib/idle_test/test_help_about.py +++ b/Lib/idlelib/idle_test/test_help_about.py @@ -2,10 +2,10 @@ Coverage: ''' -from idlelib import aboutDialog as help_about -from idlelib import textView as textview +from idlelib import help_about +from idlelib import textview from idlelib.idle_test.mock_idle import Func -from idlelib.idle_test.mock_tk import Mbox +from idlelib.idle_test.mock_tk import Mbox_func import unittest About = help_about.AboutDialog @@ -19,33 +19,33 @@ class Dummy_about_dialog(): class DisplayFileTest(unittest.TestCase): - "Test that .txt files are found and properly decoded." dialog = Dummy_about_dialog() @classmethod def setUpClass(cls): - cls.orig_mbox = textview.tkMessageBox + cls.orig_error = textview.showerror cls.orig_view = textview.view_text - cls.mbox = Mbox() + cls.error = Mbox_func() cls.view = Func() - textview.tkMessageBox = cls.mbox + textview.showerror = cls.error textview.view_text = cls.view cls.About = Dummy_about_dialog() @classmethod def tearDownClass(cls): - textview.tkMessageBox = cls.orig_mbox + textview.showerror = cls.orig_error textview.view_text = cls.orig_view def test_file_isplay(self): for handler in (self.dialog.idle_credits, self.dialog.idle_readme, self.dialog.idle_news): - self.mbox.showerror.message = '' + self.error.message = '' self.view.called = False - handler() - self.assertEqual(self.mbox.showerror.message, '') - self.assertEqual(self.view.called, True) + with self.subTest(handler=handler): + handler() + self.assertEqual(self.error.message, '') + self.assertEqual(self.view.called, True) if __name__ == '__main__': |