From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 23 Nov 2013 13:21:33 +0000 (+0200)
Subject: Issue #19733: Temporary disable test_image on MacOSX.
X-Git-Tag: v3.4.0b1~62^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c17565e4a90a6b4c9e31edf5030030a365600db6;p=thirdparty%2FPython%2Fcpython.git

Issue #19733: Temporary disable test_image on MacOSX.
---

diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index d7321266af1d..2c4cb0540a8e 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -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')
diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py
index 14b4ca104d51..bd274e60d315 100644
--- a/Lib/tkinter/test/widget_tests.py
+++ b/Lib/tkinter/test/widget_tests.py
@@ -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')