Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Georg Brandl 2010-02-08 22:48:37 +00:00
parent fe6349c965
commit 11f5c9e001
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_strftime.py
View File

@ -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]