From: Georg Brandl <georg@python.org>
Date: Mon, 8 Feb 2010 22:48:37 +0000 (+0000)
Subject: Convert test failure from output-producing to self.fail().
X-Git-Tag: v2.7a4~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11f5c9e0011cfa2a9435a9c7b5c9870421310051;p=thirdparty%2FPython%2Fcpython.git

Convert test failure from output-producing to self.fail().
---

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 5043bfaf3293..b26ebec93dc2 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -118,16 +118,15 @@ class StrftimeTest(unittest.TestCase):
             try:
                 result = time.strftime(e[0], now)
             except ValueError, error:
-                print "Standard '%s' format gave error: %s" % (e[0], error)
-                continue
+                self.fail("strftime '%s' format gave error: %s" % (e[0], error))
             if re.match(escapestr(e[1], self.ampm), result):
                 continue
             if not result or result[0] == '%':
-                print "Does not support standard '%s' format (%s)" % \
-                       (e[0], e[2])
+                self.fail("strftime does not support standard '%s' format (%s)"
+                          % (e[0], e[2]))
             else:
-                print "Conflict for %s (%s):" % (e[0], e[2])
-                print "  Expected %s, but got %s" % (e[1], result)
+                self.fail("Conflict for %s (%s): expected %s, but got %s"
+                          % (e[0], e[2], e[1], result))
 
     def strftest2(self, now):
         nowsecs = str(long(now))[:-1]