traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19761: Fixed Tkinter tests on OS X.

This commit is contained in:
Serhiy Storchaka 2014-02-03 21:34:14 +02:00
parent ce591c2868 b3de1a720a
commit 512259b244
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/tkinter/test/test_tkinter/test_widgets.py
View File

@ -329,10 +329,11 @@ class EntryTest(AbstractWidgetTest, unittest.TestCase):
self.checkColorParam(widget, 'disabledbackground')
def test_insertborderwidth(self):
widget = self.create()
self.checkPixelsParam(widget, 'insertborderwidth', 0, 1.3, -2)
self.checkParam(widget, 'insertborderwidth', 2, expected=1)
self.checkParam(widget, 'insertborderwidth', '10p', expected=1)
widget = self.create(insertwidth=100)
self.checkPixelsParam(widget, 'insertborderwidth',
0, 1.3, 2.6, 6, -2, '10p')
# insertborderwidth is bounded above by a half of insertwidth.
self.checkParam(widget, 'insertborderwidth', 60, expected=100//2)
def test_insertwidth(self):
widget = self.create()

12
Lib/tkinter/test/widget_tests.py
View File

@ -6,6 +6,7 @@ import tkinter
from tkinter.ttk import setup_master, Scale
from tkinter.test.support import (tcl_version, requires_tcl, get_tk_patchlevel,
pixels_conv, tcl_obj_eq)
import test.support
noconv = False
@ -234,8 +235,14 @@ class StandardOptionsTests:
widget = self.create()
self.checkParam(widget, 'bitmap', 'questhead')
self.checkParam(widget, 'bitmap', 'gray50')
self.checkInvalidParam(widget, 'bitmap', 'spam',
errmsg='bitmap "spam" not defined')
filename = test.support.findfile('python.xbm', subdir='imghdrdata')
self.checkParam(widget, 'bitmap', '@' + filename)
# Cocoa Tk widgets don't detect invalid -bitmap values
# See https://core.tcl.tk/tk/info/31cd33dbf0
if not ('aqua' in self.root.tk.call('tk', 'windowingsystem') and
'AppKit' in self.root.winfo_server()):
self.checkInvalidParam(widget, 'bitmap', 'spam',
errmsg='bitmap "spam" not defined')
def test_borderwidth(self):
widget = self.create()
@ -495,7 +502,6 @@ def add_standard_options(*source_classes):
return decorator
def setUpModule():
import test.support
if test.support.verbose:
tcl = tkinter.Tcl()
print('patchlevel =', tcl.call('info', 'patchlevel'))