Fixed test_user_command on OpenSolaris where floats can have different string

representation in Tcl and Python.
This commit is contained in:
Serhiy Storchaka 2014-01-23 16:48:44 +02:00
parent 744135d7bb
commit bdf0cb52eb
1 changed files with 20 additions and 9 deletions

View File

@ -199,9 +199,19 @@ class TclTest(unittest.TestCase):
result = arg
return arg
self.interp.createcommand('testfunc', testfunc)
def check(value, expected):
self.assertEqual(self.interp.call('testfunc', value), expected)
self.assertEqual(result, expected)
def check(value, expected, eq=self.assertEqual):
r = self.interp.call('testfunc', value)
self.assertIsInstance(result, str)
eq(result, expected)
self.assertIsInstance(r, str)
eq(r, expected)
def float_eq(actual, expected):
expected = float(expected)
self.assertAlmostEqual(float(actual), expected,
delta=abs(expected) * 1e-10)
def nan_eq(actual, expected):
actual = float(actual)
self.assertNotEqual(actual, actual)
check(True, '1')
check(False, '0')
@ -210,13 +220,14 @@ class TclTest(unittest.TestCase):
check('string\u20ac', 'string\u20ac')
for i in (0, 1, -1, 2**31-1, -2**31):
check(i, str(i))
for f in (0.0, 1.0, -1.0, 1/3,
sys.float_info.min, sys.float_info.max,
for f in (0.0, 1.0, -1.0):
check(f, repr(f))
for f in (1/3.0, sys.float_info.min, sys.float_info.max,
-sys.float_info.min, -sys.float_info.max):
check(f, str(f))
check(float('nan'), 'NaN')
check(float('inf'), 'Inf')
check(-float('inf'), '-Inf')
check(f, f, eq=float_eq)
check(float('inf'), 'Inf', eq=float_eq)
check(-float('inf'), '-Inf', eq=float_eq)
check(float('nan'), 'NaN', eq=nan_eq)
check((), '')
check((1, (2,), (3, 4), '5 6', ()), '1 2 {3 4} {5 6} {}')