cpython: 3912934e99ba (original) (raw)
Mercurial > cpython
changeset 87414:3912934e99ba 2.7
Issue #19733: Temporary disable test_image on MacOSX. [#19733]
| Serhiy Storchaka storchaka@gmail.com | |
|---|---|
| date | Sat, 23 Nov 2013 15:22:20 +0200 |
| parents | 08f282c96fd1 |
| children | ef4636faf8bd |
| files | Lib/lib-tk/test/test_tkinter/test_widgets.py Lib/lib-tk/test/widget_tests.py |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-)[+] [-] Lib/lib-tk/test/test_tkinter/test_widgets.py 8 Lib/lib-tk/test/widget_tests.py 4 |
line wrap: on
line diff
--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py +++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py @@ -1,6 +1,7 @@ import unittest import Tkinter import os +import sys from test.test_support import requires, run_unittest from test_ttk.support import (tcl_version, requires_tcl, get_tk_patchlevel, @@ -259,6 +260,13 @@ class MenubuttonTest(AbstractLabelTest, test_highlightthickness = StandardOptionsTests.test_highlightthickness.im_func +<<<<<<< +=======
+>>>>>>> def test_image(self): widget = self.create() image = Tkinter.PhotoImage('image1')
--- a/Lib/lib-tk/test/widget_tests.py +++ b/Lib/lib-tk/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 ttk import setup_master, Scale from test_ttk.support import (tcl_version, requires_tcl, get_tk_patchlevel, @@ -308,6 +310,8 @@ class StandardOptionsTests(object): self.checkParam(widget, 'highlightthickness', -2, expected=0, conv=self._conv_pixels)