mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #19085. Try to fix tkinter tests on Windows.

This commit is contained in:
Serhiy Storchaka 2013-11-02 16:41:23 +02:00
parent bf30c9f01a
commit 28f0beaff6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/tkinter/test/test_tkinter/test_widgets.py
View File

@ -73,7 +73,10 @@ def test_menu(self):
def test_screen(self): def test_screen(self):
widget = self.create() widget = self.create()
self.assertEqual(widget['screen'], '') self.assertEqual(widget['screen'], '')
try:
display = os.environ['DISPLAY'] display = os.environ['DISPLAY']
except KeyError:
self.skipTest('No $DISPLAY set.')
self.checkInvalidParam(widget, 'screen', display, self.checkInvalidParam(widget, 'screen', display,
errmsg="can't modify -screen option after widget is created") errmsg="can't modify -screen option after widget is created")
widget2 = self.create(screen=display) widget2 = self.create(screen=display)
@ -82,13 +85,10 @@ def test_screen(self):
def test_use(self): def test_use(self):
widget = self.create() widget = self.create()
self.assertEqual(widget['use'], '') self.assertEqual(widget['use'], '')
widget1 = self.create(container=True) parent = self.create(container=True)
self.assertEqual(widget1['use'], '') wid = parent.winfo_id()
self.checkInvalidParam(widget1, 'use', '0x44022',
errmsg="can't modify -use option after widget is created")
wid = hex(widget1.winfo_id())
widget2 = self.create(use=wid) widget2 = self.create(use=wid)
self.assertEqual(widget2['use'], wid) self.assertEqual(int(widget2['use']), wid)
@add_standard_options(StandardOptionsTests) @add_standard_options(StandardOptionsTests)