diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-23 13:21:33 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-23 13:21:33 (GMT) |
commit | c17565e4a90a6b4c9e31edf5030030a365600db6 (patch) | |
tree | f7d56248392917a125f4d7b614ee6c0112ca048f /Lib/tkinter | |
parent | f92ef9be46ad7a1ca7fc177074892e6486e8b35f (diff) | |
download | cpython-c17565e4a90a6b4c9e31edf5030030a365600db6.zip cpython-c17565e4a90a6b4c9e31edf5030030a365600db6.tar.gz cpython-c17565e4a90a6b4c9e31edf5030030a365600db6.tar.bz2 |
Issue #19733: Temporary disable test_image on MacOSX.
Diffstat (limited to 'Lib/tkinter')
-rw-r--r-- | Lib/tkinter/test/test_tkinter/test_widgets.py | 3 | ||||
-rw-r--r-- | Lib/tkinter/test/widget_tests.py | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py index d732126..2c4cb05 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 14b4ca1..bd274e6 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') |