Change verify() function to raise TestFailed, not AssertionError.

(I realize that I didn't really test this, because all the tests
succeed, so verify() never raised an AssertionError -- but the test
suite still succeeds, so I'm not too worried.)

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index c1abf1bf2457cdb1792debace97c3beb43e72609..771b14715551735840d72273b1868c29b1670a0e 100644 (file)
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -71,11 +71,11 @@ def findfile(file, here=__file__):
     return file
 
 def verify(condition, reason='test failed'):
-    """Verify that condition is true. If not, raise an AssertionError.
+    """Verify that condition is true. If not, raise TestFailed.
 
        The optinal argument reason can be given to provide
        a better error text.
     """
 
     if not condition:
-        raise AssertionError(reason)
+        raise TestFailed(reason)

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 513b5ad40ce6beefbecb17a6c2132eea14e7c337..855b0a2edb12c42eb9941e35e12182aab46f8676 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -411,7 +411,7 @@ try:
 except ValueError:
     pass
 else:
-    raise AssertionError, "u'Andr\202'.encode('ascii') failed to raise an exception"
+    raise TestFailed, "u'Andr\202'.encode('ascii') failed to raise an exception"
 verify(u'Andr\202 x'.encode('ascii','ignore') == "Andr x")
 verify(u'Andr\202 x'.encode('ascii','replace') == "Andr? x")
 
@@ -421,7 +421,7 @@ try:
 except ValueError:
     pass
 else:
-    raise AssertionError, "unicode('Andr\202') failed to raise an exception"
+    raise TestFailed, "unicode('Andr\202') failed to raise an exception"
 verify(unicode('Andr\202 x','ascii','ignore') == u"Andr x")
 verify(unicode('Andr\202 x','ascii','replace') == u'Andr\uFFFD x')
 
@@ -443,7 +443,7 @@ for encoding in (
     ):
     try:
         verify(unicode(u.encode(encoding),encoding) == u)
-    except AssertionError:
+    except TestFailed:
         print '*** codec "%s" failed round-trip' % encoding
     except ValueError,why:
         print '*** codec for "%s" failed: %s' % (encoding, why)
@@ -454,7 +454,7 @@ for encoding in (
     ):
     try:
         verify(unicode(u.encode(encoding),encoding) == u)
-    except AssertionError:
+    except TestFailed:
         print '*** codec "%s" failed round-trip' % encoding
     except ValueError,why:
         print '*** codec for "%s" failed: %s' % (encoding, why)
@@ -488,7 +488,7 @@ for encoding in (
     ):
     try:
         verify(unicode(s,encoding).encode(encoding) == s)
-    except AssertionError:
+    except TestFailed:
         print '*** codec "%s" failed round-trip' % encoding
     except ValueError,why:
         print '*** codec for "%s" failed: %s' % (encoding, why)
@@ -518,7 +518,7 @@ for encoding in (
     ):
     try:
         verify(unicode(s,encoding).encode(encoding) == s)
-    except AssertionError:
+    except TestFailed:
         print '*** codec "%s" failed round-trip' % encoding
     except ValueError,why:
         print '*** codec for "%s" failed: %s' % (encoding, why)