Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2013-06-05 14:36:50 -04:00
commit 448f1a86ef
2 changed files with 6 additions and 6 deletions

View File

@ -91,7 +91,7 @@ class GetCfgSectionNameDialog(Toplevel):
if __name__ == '__main__':
import unittest
unittest.main('idlelib.idle_test.test_config_name', verbosity=2, exit=False)
# also human test the dialog
root = Tk()
def run():

View File

@ -24,7 +24,7 @@ showerror = Mbox.showerror
class TestConfigName(unittest.TestCase):
dialog = Dummy_name_dialog()
@classmethod
def setUpClass(cls):
name_dialog_module.tkMessageBox = Mbox
@ -38,13 +38,13 @@ class TestConfigName(unittest.TestCase):
self.assertEqual(self.dialog.name_ok(), '')
self.assertEqual(showerror.title, 'Name Error')
self.assertIn('No', showerror.message)
def test_used_name(self):
self.dialog.name.set('used')
self.assertEqual(self.dialog.name_ok(), '')
self.assertEqual(showerror.title, 'Name Error')
self.assertIn('use', showerror.message)
def test_long_name(self):
self.dialog.name.set('good'*8)
self.assertEqual(self.dialog.name_ok(), '')
@ -56,7 +56,7 @@ class TestConfigName(unittest.TestCase):
showerror.title = 'No Error' # should not be called
self.assertEqual(self.dialog.name_ok(), 'good')
self.assertEqual(showerror.title, 'No Error')
def test_ok(self):
self.dialog.destroyed = False
self.dialog.name.set('good')
@ -69,7 +69,7 @@ class TestConfigName(unittest.TestCase):
self.dialog.Cancel()
self.assertEqual(self.dialog.result, '')
self.assertTrue(self.dialog.destroyed)
if __name__ == '__main__':
unittest.main(verbosity=2, exit=False)