summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2020-12-16 10:31:49 (GMT)
committerGitHub <noreply@github.com>2020-12-16 10:31:49 (GMT)
commit5f0fe8ec70120f4586d08978b0911b436f82c421 (patch)
tree03a65e3b4a464a4460317dcd5d8f89e1d9749bee /Lib/tkinter
parent79782fe4f8cf73d7fdf8db02073bbadf7ff817b6 (diff)
downloadcpython-5f0fe8ec70120f4586d08978b0911b436f82c421.zip
cpython-5f0fe8ec70120f4586d08978b0911b436f82c421.tar.gz
cpython-5f0fe8ec70120f4586d08978b0911b436f82c421.tar.bz2
bpo-19733: Re-enable tests for -image option in Tkinter (GH-23785)
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/test/test_tkinter/test_widgets.py3
-rw-r--r--Lib/tkinter/test/widget_tests.py3
2 files changed, 0 insertions, 6 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py
index b6f792d..4b9b6eb 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 b42ff52..ad4a8bd 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')