diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:04:51 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:04:51 +0000 |
| commit | 91fe842bbfaa6f76cab34ae02b25c2927e6dab8a (patch) | |
| tree | 112a657e237a80249b561da594826d0ee53ec78c /Lib/tkinter/test/test_ttk/test_widgets.py | |
| parent | 3ef2fa0b4aec37c2705a56a7f4fcf1a5ead1af49 (diff) | |
| download | cpython-91fe842bbfaa6f76cab34ae02b25c2927e6dab8a.tar.gz | |
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.
........
Diffstat (limited to 'Lib/tkinter/test/test_ttk/test_widgets.py')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 48a5223018..fc3d1e5fd0 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -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)) |