Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9

on Mac OS X.  (Patch by Ronald Oussoren)
This commit is contained in:
Ned Deily 2011-05-29 15:28:54 -07:00
parent 65f7db3f59
commit d8e08067b9
2 changed files with 19 additions and 4 deletions

View File

@ -3,6 +3,7 @@ import tkinter
import os
from tkinter import ttk
from test.support import requires, run_unittest
import sys
import tkinter.test.support as support
from tkinter.test.test_ttk.test_functions import MockTclObj, MockStateSpec
@ -561,11 +562,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")
@ -722,7 +731,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))

View File

@ -770,6 +770,9 @@ Extension Modules
Tests
-----
- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
on Mac OS X. (Patch by Ronald Oussoren)
- Issue #12180: Fixed a few remaining errors in test_packaging when no
threading.