diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-03 19:34:14 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-03 19:34:14 (GMT) |
| commit | 512259b2441e6324064ef54471c7ad8c7475ee7e (patch) | |
| tree | 3652f65236dc40d4497d58d65a5595c175d4bcfd | |
| parent | ce591c2868385748ef13f636f8d50309e007a809 (diff) | |
| parent | b3de1a720a7dffcf86bf7e7301263590b5972186 (diff) | |
| download | cpython-512259b2441e6324064ef54471c7ad8c7475ee7e.zip cpython-512259b2441e6324064ef54471c7ad8c7475ee7e.tar.gz cpython-512259b2441e6324064ef54471c7ad8c7475ee7e.tar.bz2 | |
Issue #19761: Fixed Tkinter tests on OS X.
| -rw-r--r-- | Lib/tkinter/test/test_tkinter/test_widgets.py | 9 | ||||
| -rw-r--r-- | Lib/tkinter/test/widget_tests.py | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py index 4de6531..47e281f 100644 --- a/Lib/tkinter/test/test_tkinter/test_widgets.py +++ b/Lib/tkinter/test/test_tkinter/test_widgets.py @@ -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() diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py index ac194a8..a9820a7 100644 --- a/Lib/tkinter/test/widget_tests.py +++ b/Lib/tkinter/test/widget_tests.py @@ -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')) |