[Python-checkins] cpython (merge 3.3 -> default): Fixed test_user_command on OpenSolaris where floats can have different string

[serhiy.storchaka]

http://hg.python.org/cpython/rev/ede0a342ed7e
changeset:   88659:ede0a342ed7e
parent:      88657:9adce4e25bdb
parent:      88658:fed5d501a179
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Jan 23 16:49:22 2014 +0200
summary:
  Fixed test_user_command on OpenSolaris where floats can have different string
representation in Tcl and Python.

files:
  Lib/test/test_tcl.py |  29 ++++++++++++++++++++---------
  1 files changed, 20 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -199,9 +199,19 @@
             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 @@
         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} {}')
 

-- 
Repository URL: http://hg.python.org/cpython