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:28:50 +02:00
parent ec773cc9c3
commit 5542b15d25
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Lib/test/test_tcl.py
View File

@ -33,6 +33,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
@ -178,24 +179,32 @@ class TclTest(unittest.TestCase):
def test_passing_values(self): def test_passing_values(self):
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(False), False) self.assertEqual(passValue(True), True if self.wantobjects else '1')
self.assertEqual(passValue('string'), 'string') self.assertEqual(passValue(False), False if self.wantobjects else '0')
self.assertEqual(passValue('string\u20ac'), 'string\u20ac')
self.assertEqual(passValue(u'string'), u'string') self.assertEqual(passValue(u'string'), u'string')
self.assertEqual(passValue(u'string\u20ac'), u'string\u20ac') self.assertEqual(passValue(u'string\u20ac'), u'string\u20ac')
for i in (0, 1, -1, int(2**31-1), int(-2**31)): for i in (0, 1, -1, int(2**31-1), int(-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, 1/3.0, for f in (0.0, 1.0, -1.0, 1//3, 1/3.0,
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):
self.assertEqual(passValue(f), f) if self.wantobjects:
for f in float('nan'), float('inf'), -float('inf'):
if f != f: # NaN
self.assertNotEqual(passValue(f), f)
else:
self.assertEqual(passValue(f), f) self.assertEqual(passValue(f), f)
self.assertEqual(passValue((1, '2', (3.4,))), (1, '2', (3.4,))) else:
self.assertEqual(float(passValue(f)), f)
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
@ -220,12 +229,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, u'\u20ac', '\xe2\x82\xac', (3.4,)), (call('dict', 'create', 1, u'\u20ac', '\xe2\x82\xac', (3.4,)),
(1, u'\u20ac', u'\u20ac', (3.4,))), (1, u'\u20ac', u'\u20ac', (3.4,)) if self.wantobjects else
('1', '\xe2\x82\xac', '\xe2\x82\xac', '3.4')),
] ]
for arg, res in testcases: for arg, res in testcases:
self.assertEqual(splitlist(arg), res) self.assertEqual(splitlist(arg), res)
@ -257,12 +269,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, u'\u20ac', '\xe2\x82\xac', (3.4,)), (call('dict', 'create', 12, u'\u20ac', '\xe2\x82\xac', (3.4,)),
(12, u'\u20ac', u'\u20ac', (3.4,))), (12, u'\u20ac', u'\u20ac', (3.4,)) if self.wantobjects else
('12', '\xe2\x82\xac', '\xe2\x82\xac', '3.4')),
] ]
for arg, res in testcases: for arg, res in testcases:
self.assertEqual(split(arg), res) self.assertEqual(split(arg), res)

2
Misc/NEWS
View File

@ -132,6 +132,8 @@ IDLE
Tests Tests
----- -----
- Issue #19320: test_tcl no longer fails when wantobjects is false.
- Issue #19683: Removed empty tests from test_minidom. Initial patch by - Issue #19683: Removed empty tests from test_minidom. Initial patch by
Ajitesh Gupta. Ajitesh Gupta.