]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19733: Temporary disable test_image on MacOSX.
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 23 Nov 2013 13:21:33 +0000 (15:21 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 23 Nov 2013 13:21:33 +0000 (15:21 +0200)
Lib/tkinter/test/test_tkinter/test_widgets.py
Lib/tkinter/test/widget_tests.py

index d7321266af1d8d9174e2df8e751464b1c33ea1be..2c4cb0540a8ed0d01deedd5909eb6ebb2422d871 100644 (file)
@@ -1,6 +1,7 @@
 import unittest
 import tkinter
 import os
+import sys
 from test.support import requires
 
 from tkinter.test.support import (tcl_version, requires_tcl,
@@ -262,6 +263,8 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase):
 
     test_highlightthickness = StandardOptionsTests.test_highlightthickness
 
+    @unittest.skipIf(sys.platform == 'darwin',
+                     'crashes with Cocoa Tk (issue19733)')
     def test_image(self):
         widget = self.create()
         image = tkinter.PhotoImage('image1')
index 14b4ca104d51d775b13c90da943296f3b426c6f0..bd274e60d315ccbd9412b636e2d7b5159a60f010 100644 (file)
@@ -1,5 +1,7 @@
 # Common tests for test_tkinter/test_widgets.py and test_ttk/test_widgets.py
 
+import unittest
+import sys
 import tkinter
 from tkinter.ttk import setup_master, Scale
 from tkinter.test.support import (tcl_version, requires_tcl, get_tk_patchlevel,
@@ -289,6 +291,8 @@ class StandardOptionsTests:
         self.checkParam(widget, 'highlightthickness', -2, expected=0,
                         conv=self._conv_pixels)
 
+    @unittest.skipIf(sys.platform == 'darwin',
+                     'crashes with Cocoa Tk (issue19733)')
     def test_image(self):
         widget = self.create()
         self.checkImageParam(widget, 'image')