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

miss-islington webhook-mailer at python.org
Wed Dec 16 05:54:25 EST 2020


https://github.com/python/cpython/commit/cd7412e3c4a2805009d0baa948cd4026d6fa6f3d
commit: cd7412e3c4a2805009d0baa948cd4026d6fa6f3d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2020-12-16T02:54:04-08:00
summary:

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

(cherry picked from commit 5f0fe8ec70120f4586d08978b0911b436f82c421)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/tkinter/test/test_tkinter/test_widgets.py
M Lib/tkinter/test/widget_tests.py

diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index b6f792d6c2cf8..4b9b6ebdda04e 100644
--- a/Lib/tkinter/test/test_tkinter/test_widgets.py
+++ b/Lib/tkinter/test/test_tkinter/test_widgets.py
@@ -2,7 +2,6 @@
 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 @@ def test_height(self):
 
     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 b42ff52178f29..ad4a8bd2bf325 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 @@ def test_highlightthickness(self):
         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')



More information about the Python-checkins mailing list