diff options
author | Ned Deily <nad@acm.org> | 2011-06-28 06:09:31 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-06-28 06:09:31 (GMT) |
commit | 64e59959f21711bc3db36230eccfaa485faf34f9 (patch) | |
tree | 42b7a9b392694ed55b882471b28c041ba8d16bc5 /Lib/lib-tk/test/test_ttk/test_widgets.py | |
parent | c98198d3ca0b02ab07f5a8109941a0ff38d7e388 (diff) | |
download | cpython-64e59959f21711bc3db36230eccfaa485faf34f9.zip cpython-64e59959f21711bc3db36230eccfaa485faf34f9.tar.gz cpython-64e59959f21711bc3db36230eccfaa485faf34f9.tar.bz2 |
Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
on Mac OS X. (Patch by Ronald Oussoren)
Diffstat (limited to 'Lib/lib-tk/test/test_ttk/test_widgets.py')
-rw-r--r-- | Lib/lib-tk/test/test_ttk/test_widgets.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py index 236323c..2cad6bd 100644 --- a/Lib/lib-tk/test/test_ttk/test_widgets.py +++ b/Lib/lib-tk/test/test_ttk/test_widgets.py @@ -2,6 +2,7 @@ import unittest import Tkinter import ttk from test.test_support import requires, run_unittest +import sys import support from test_functions import MockTclObj, MockStateSpec @@ -560,11 +561,19 @@ class NotebookTest(unittest.TestCase): self.nb.pack() self.nb.wait_visibility() - self.assertEqual(self.nb.tab('@5,5'), self.nb.tab('current')) + if sys.platform == 'darwin': + tb_idx = "@20,5" + else: + tb_idx = "@5,5" + self.assertEqual(self.nb.tab(tb_idx), self.nb.tab('current')) for i in range(5, 100, 5): - if self.nb.tab('@%d, 5' % i, text=None) == 'a': - break + try: + if self.nb.tab('@%d, 5' % i, text=None) == 'a': + break + except Tkinter.TclError: + pass + else: self.fail("Tab with text 'a' not found") @@ -721,7 +730,10 @@ class NotebookTest(unittest.TestCase): self.nb.enable_traversal() self.nb.focus_force() support.simulate_mouse_click(self.nb, 5, 5) - self.nb.event_generate('<Alt-a>') + if sys.platform == 'darwin': + self.nb.event_generate('<Option-a>') + else: + self.nb.event_generate('<Alt-a>') self.assertEqual(self.nb.select(), str(self.child1)) |