From bdf0cb52eb4b0676003b3d3ee08f1a48528f1959 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 23 Jan 2014 16:48:44 +0200 Subject: [PATCH] Fixed test_user_command on OpenSolaris where floats can have different string representation in Tcl and Python. --- Lib/test/test_tcl.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 06f464664a8..0520c0944af 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -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} {}')