diff options
| author | Georg Brandl <georg@python.org> | 2010-03-14 10:51:01 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-03-14 10:51:01 (GMT) |
| commit | c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f (patch) | |
| tree | b9223ba25ba501ae2357f0214b79eaad25ae5357 /Lib/test/test_strftime.py | |
| parent | 1b37e8728c654efe928b9bc028b2f4f5621a35ea (diff) | |
| download | cpython-c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f.zip cpython-c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f.tar.gz cpython-c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f.tar.bz2 | |
Merged revisions 78101,78115,78117,78182,78188,78245,78386,78496 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78101 | georg.brandl | 2010-02-08 01:04:54 +0100 (Mo, 08 Feb 2010) | 1 line
Fix test_fnmatch.
........
r78115 | georg.brandl | 2010-02-08 23:40:51 +0100 (Mo, 08 Feb 2010) | 1 line
Fix missing string formatting placeholder.
........
r78117 | georg.brandl | 2010-02-08 23:48:37 +0100 (Mo, 08 Feb 2010) | 1 line
Convert test failure from output-producing to self.fail().
........
r78182 | georg.brandl | 2010-02-14 09:18:23 +0100 (So, 14 Feb 2010) | 1 line
#7926: fix stray parens.
........
r78188 | georg.brandl | 2010-02-14 14:38:12 +0100 (So, 14 Feb 2010) | 1 line
#7926: fix-up wording.
........
r78245 | georg.brandl | 2010-02-19 20:36:08 +0100 (Fr, 19 Feb 2010) | 1 line
#7967: PyXML is no more.
........
r78386 | georg.brandl | 2010-02-23 22:48:57 +0100 (Di, 23 Feb 2010) | 1 line
#6544: fix refleak in kqueue, occurring in certain error conditions.
........
r78496 | georg.brandl | 2010-02-27 15:58:08 +0100 (Sa, 27 Feb 2010) | 1 line
Link to http://www.python.org/dev/workflow/ from bugs page.
........
Diffstat (limited to 'Lib/test/test_strftime.py')
| -rw-r--r-- | Lib/test/test_strftime.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 41144b7..14057eb 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -116,16 +116,15 @@ class StrftimeTest(unittest.TestCase): try: result = time.strftime(e[0], now) except ValueError as error: - print("Standard '%s' format gaver error:" % (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(int(now))[:-1] |