Merged revisions 65958 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65958 | mark.dickinson | 2008-08-21 21:02:24 +0100 (Thu, 21 Aug 2008) | 5 lines

  Fix float.fromhex test to give additional information on failure.  This
  change is aimed at diagnosing issue 3633 (test_float fails on Solaris).

  Reviewed by Benjamin Peterson
........

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index db91e5e25ec3426cd8ba736c469970969c347e13..cad745b799dbe7b9c2dc3628e57c725dc6fa58ec 100644 (file)
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -448,7 +448,13 @@ class HexFloatTestCase(unittest.TestCase):
             '0x1p0\0 0x1p0',  # embedded null byte is not end of string
             ]
         for x in invalid_inputs:
-            self.assertRaises(ValueError, fromHex, x)
+            try:
+                result = fromHex(x)
+            except ValueError:
+                pass
+            else:
+                self.fail('Expected float.fromhex(%r) to raise ValueError; '
+                          'got %r instead' % (x, result))
 
 
     def test_from_hex(self):