From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 16 Dec 2020 10:31:49 +0000 (+0200)
Subject: bpo-19733: Re-enable tests for -image option in Tkinter (GH-23785)
X-Git-Tag: v3.10.0a4~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f0fe8ec70120f4586d08978b0911b436f82c421;p=thirdparty%2FPython%2Fcpython.git

bpo-19733: Re-enable tests for -image option in Tkinter (GH-23785)
---

diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index b6f792d6c2cf..4b9b6ebdda04 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -2,7 +2,6 @@ import unittest
 import tkinter
 from tkinter import TclError
 import os
-import sys
 from test.support import requires
 
 from tkinter.test.support import (tcl_version, requires_tcl,
@@ -265,8 +264,6 @@ 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(master=self.root, name='image1')
diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py
index b42ff52178f2..ad4a8bd2bf32 100644
--- a/Lib/tkinter/test/widget_tests.py
+++ b/Lib/tkinter/test/widget_tests.py
@@ -1,7 +1,6 @@
 # Common tests for test_tkinter/test_widgets.py and test_ttk/test_widgets.py
 
 import unittest
-import sys
 import tkinter
 from tkinter.test.support import (AbstractTkTest, tcl_version, requires_tcl,
                                   get_tk_patchlevel, pixels_conv, tcl_obj_eq)
@@ -332,8 +331,6 @@ 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')