traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #19320: test_tcl no longer fails when wantobjects is false.

This commit is contained in:
Serhiy Storchaka 2013-12-25 17:29:41 +02:00
parent 81d2be9580 cc4290bf91
commit cb131948fe
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/test/test_tcl.py
View File

@ -35,6 +35,7 @@ class TclTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.interp = Tcl() self.interp = Tcl()
self.wantobjects = self.interp.tk.wantobjects()
def testEval(self): def testEval(self):
tcl = self.interp tcl = self.interp
@ -167,22 +168,31 @@ class TclTest(unittest.TestCase):
def passValue(value): def passValue(value):
return self.interp.call('set', '_', value) return self.interp.call('set', '_', value)
self.assertEqual(passValue(True), True) self.assertEqual(passValue(True), True if self.wantobjects else '1')
self.assertEqual(passValue(False), False) self.assertEqual(passValue(False), False if self.wantobjects else '0')
self.assertEqual(passValue('string'), 'string') self.assertEqual(passValue('string'), 'string')
self.assertEqual(passValue('string\u20ac'), 'string\u20ac') self.assertEqual(passValue('string\u20ac'), 'string\u20ac')
for i in (0, 1, -1, 2**31-1, -2**31): for i in (0, 1, -1, 2**31-1, -2**31):
self.assertEqual(passValue(i), i) self.assertEqual(passValue(i), i if self.wantobjects else str(i))
for f in (0.0, 1.0, -1.0, 1/3, for f in (0.0, 1.0, -1.0, 1/3,
sys.float_info.min, sys.float_info.max, sys.float_info.min, sys.float_info.max,
-sys.float_info.min, -sys.float_info.max): -sys.float_info.min, -sys.float_info.max):
if self.wantobjects:
self.assertEqual(passValue(f), f) self.assertEqual(passValue(f), f)
for f in float('nan'), float('inf'), -float('inf'):
if f != f: # NaN
self.assertNotEqual(passValue(f), f)
else: else:
self.assertEqual(passValue(f), f) self.assertEqual(float(passValue(f)), f)
self.assertEqual(passValue((1, '2', (3.4,))), (1, '2', (3.4,))) if self.wantobjects:
f = passValue(float('nan'))
self.assertNotEqual(f, f)
self.assertEqual(passValue(float('inf')), float('inf'))
self.assertEqual(passValue(-float('inf')), -float('inf'))
else:
f = float(passValue(float('nan')))
self.assertNotEqual(f, f)
self.assertEqual(float(passValue(float('inf'))), float('inf'))
self.assertEqual(float(passValue(-float('inf'))), -float('inf'))
self.assertEqual(passValue((1, '2', (3.4,))),
(1, '2', (3.4,)) if self.wantobjects else '1 2 3.4')
def test_splitlist(self): def test_splitlist(self):
splitlist = self.interp.tk.splitlist splitlist = self.interp.tk.splitlist
@ -207,12 +217,15 @@ class TclTest(unittest.TestCase):
('a 3.4', ('a', '3.4')), ('a 3.4', ('a', '3.4')),
(('a', 3.4), ('a', 3.4)), (('a', 3.4), ('a', 3.4)),
((), ()), ((), ()),
(call('list', 1, '2', (3.4,)), (1, '2', (3.4,))), (call('list', 1, '2', (3.4,)),
(1, '2', (3.4,)) if self.wantobjects else
('1', '2', '3.4')),
] ]
if tcl_version >= (8, 5): if tcl_version >= (8, 5):
testcases += [ testcases += [
(call('dict', 'create', 1, '\u20ac', b'\xe2\x82\xac', (3.4,)), (call('dict', 'create', 1, '\u20ac', b'\xe2\x82\xac', (3.4,)),
(1, '\u20ac', '\u20ac', (3.4,))), (1, '\u20ac', '\u20ac', (3.4,)) if self.wantobjects else
('1', '\u20ac', '\u20ac', '3.4')),
] ]
for arg, res in testcases: for arg, res in testcases:
self.assertEqual(splitlist(arg), res, msg=arg) self.assertEqual(splitlist(arg), res, msg=arg)
@ -244,12 +257,15 @@ class TclTest(unittest.TestCase):
(('a', 3.4), ('a', 3.4)), (('a', 3.4), ('a', 3.4)),
(('a', (2, 3.4)), ('a', (2, 3.4))), (('a', (2, 3.4)), ('a', (2, 3.4))),
((), ()), ((), ()),
(call('list', 1, '2', (3.4,)), (1, '2', (3.4,))), (call('list', 1, '2', (3.4,)),
(1, '2', (3.4,)) if self.wantobjects else
('1', '2', '3.4')),
] ]
if tcl_version >= (8, 5): if tcl_version >= (8, 5):
testcases += [ testcases += [
(call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)), (call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),
(12, '\u20ac', '\u20ac', (3.4,))), (12, '\u20ac', '\u20ac', (3.4,)) if self.wantobjects else
('12', '\u20ac', '\u20ac', '3.4')),
] ]
for arg, res in testcases: for arg, res in testcases:
self.assertEqual(split(arg), res, msg=arg) self.assertEqual(split(arg), res, msg=arg)

2
Misc/NEWS
View File

@ -253,6 +253,8 @@ IDLE
Tests Tests
----- -----
- Issue #19320: test_tcl no longer fails when wantobjects is false.
- Issue #19919: Fix flacky SSL test. connect_ex() sometimes returns - Issue #19919: Fix flacky SSL test. connect_ex() sometimes returns
EWOULDBLOCK on Windows or VMs hosted on Windows. EWOULDBLOCK on Windows or VMs hosted on Windows.