Merged revisions 79903,79907 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79903 | martin.v.loewis | 2010-04-08 04:47:40 -0500 (Thu, 08 Apr 2010) | 2 lines

  Issue #8344: Fix test_ttk bug on FreeBSD.
........
  r79907 | martin.v.loewis | 2010-04-08 12:38:32 -0500 (Thu, 08 Apr 2010) | 2 lines

  Issue #8204: Fix test_ttk notebook test by forcing focus.
........
This commit is contained in:
Benjamin Peterson 2010-04-11 22:04:51 +00:00
parent 87cb787688
commit a0820897a8
1 changed files with 6 additions and 2 deletions

View File

@ -704,15 +704,19 @@ class NotebookTest(unittest.TestCase):
self.nb.select(0)
support.simulate_mouse_click(self.nb, 5, 5)
self.nb.focus_force()
self.nb.event_generate('<Control-Tab>')
self.assertEqual(self.nb.select(), str(self.child2))
self.nb.focus_force()
self.nb.event_generate('<Shift-Control-Tab>')
self.assertEqual(self.nb.select(), str(self.child1))
self.nb.focus_force()
self.nb.event_generate('<Shift-Control-Tab>')
self.assertEqual(self.nb.select(), str(self.child2))
self.nb.tab(self.child1, text='a', underline=0)
self.nb.enable_traversal()
self.nb.focus_force()
self.nb.event_generate('<Alt-a>')
self.assertEqual(self.nb.select(), str(self.child1))
@ -1112,9 +1116,9 @@ class TreeviewTest(unittest.TestCase):
self.assertRaises(tkinter.TclError, self.tv.tag_configure,
'test', sky='blue')
self.tv.tag_configure('test', foreground='blue')
self.assertEqual(self.tv.tag_configure('test', 'foreground'),
self.assertEqual(str(self.tv.tag_configure('test', 'foreground')),
'blue')
self.assertEqual(self.tv.tag_configure('test', foreground=None),
self.assertEqual(str(self.tv.tag_configure('test', foreground=None)),
'blue')
self.assertTrue(isinstance(self.tv.tag_configure('test'), dict))