diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-03 21:33:33 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-03 21:33:33 +0200 |
| commit | 0b3fc6f363cf730af077bcc9086bb163435a02ad (patch) | |
| tree | 5c39feb726c28d1e0cb851a64eb8796b4a800e92 /Lib/tkinter/test/widget_tests.py | |
| parent | 2753a69a18c6839c41386f50ed6c33098e186c7c (diff) | |
| download | cpython-0b3fc6f363cf730af077bcc9086bb163435a02ad.tar.gz | |
Issue #19761: Fixed Tkinter tests on OS X.
Diffstat (limited to 'Lib/tkinter/test/widget_tests.py')
| -rw-r--r-- | Lib/tkinter/test/widget_tests.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py index ac194a8995..a9820a7f68 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')) |