[Python-checkins] cpython (2.7): Issue #19761: Fixed Tkinter tests on OS X.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/129eb818d9b2
changeset:   88936:129eb818d9b2
branch:      2.7
parent:      88933:65c29c07bb31
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Feb 03 21:33:21 2014 +0200
summary:
  Issue #19761: Fixed Tkinter tests on OS X.

files:
  Lib/lib-tk/test/test_tkinter/test_widgets.py |   9 ++++---
  Lib/lib-tk/test/widget_tests.py              |  12 +++++++--
  2 files changed, 14 insertions(+), 7 deletions(-)


diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py
--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py
+++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py
@@ -326,10 +326,11 @@
         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/lib-tk/test/widget_tests.py b/Lib/lib-tk/test/widget_tests.py
--- a/Lib/lib-tk/test/widget_tests.py
+++ b/Lib/lib-tk/test/widget_tests.py
@@ -6,6 +6,7 @@
 from ttk import setup_master, Scale
 from test_ttk.support import (tcl_version, requires_tcl, get_tk_patchlevel,
                               pixels_conv, tcl_obj_eq)
+import test.test_support
 
 
 noconv = noconv_meth = False
@@ -253,8 +254,14 @@
         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.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()
@@ -514,7 +521,6 @@
     return decorator
 
 def setUpModule():
-    import test.test_support
     if test.test_support.verbose:
         tcl = Tkinter.Tcl()
         print 'patchlevel =', tcl.call('info', 'patchlevel')

-- 
Repository URL: http://hg.python.org/cpython