changeset: 75335:46ab2d46337c
parent: 75332:d4b17c478e49
parent: 75334:8d2ffe1f25d3
user: Nadeem Vawda <nadeem.vawda@gmail.com>
date: Wed Feb 29 00:24:46 2012 +0200
files: Lib/test/test_strptime.py
description:
Merge: Give better failure messages in test_strptime (cf. issue #14113).
diff -r d4b17c478e49 -r 46ab2d46337c Lib/test/test_strptime.py
--- a/Lib/test/test_strptime.py	Tue Feb 28 22:29:08 2012 +0100
+++ b/Lib/test/test_strptime.py	Wed Feb 29 00:24:46 2012 +0200
@@ -38,9 +38,9 @@
 comparison = testing[self.time_tuple[tuple_position]]
 self.assertIn(strftime_output, testing,
 "%s: not found in tuple" % error_msg)
- self.assertTrue(comparison == strftime_output,
- "%s: position within tuple incorrect; %s != %s" %
- (error_msg, comparison, strftime_output))
+ self.assertEqual(comparison, strftime_output,
+ "%s: position within tuple incorrect; %s != %s" %
+ (error_msg, comparison, strftime_output))
 
 def test_weekday(self):
 # Make sure that full and abbreviated weekday names are correct in
@@ -65,8 +65,8 @@
 "AM/PM representation not in tuple")
 if self.time_tuple[3] < 12: position = 0
 else: position = 1
- self.assertTrue(strftime_output == self.LT_ins.am_pm[position],
- "AM/PM representation in the wrong position within the tuple")
+ self.assertEqual(self.LT_ins.am_pm[position], strftime_output,
+ "AM/PM representation in the wrong position within the tuple")
 
 def test_timezone(self):
 # Make sure timezone is correct
@@ -165,8 +165,8 @@
 # Fixes bug #661354
 test_locale = _strptime.LocaleTime()
 test_locale.timezone = (frozenset(), frozenset())
- self.assertTrue(_strptime.TimeRE(test_locale).pattern("%Z") == '',
- "with timezone == ('',''), TimeRE().pattern('%Z') != ''")
+ self.assertEqual(_strptime.TimeRE(test_locale).pattern("%Z"), '',
+ "with timezone == ('',''), TimeRE().pattern('%Z') != ''")
 
 def test_matching_with_escapes(self):
 # Make sure a format that requires escaping of characters works
@@ -192,7 +192,7 @@
 # so as to not allow to subpatterns to end up next to each other and
 # "steal" characters from each other.
 pattern = self.time_re.pattern('%j %H')
- self.assertTrue(not re.match(pattern, "180"))
+ self.assertFalse(re.match(pattern, "180"))
 self.assertTrue(re.match(pattern, "18 0"))
 
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/46ab2d46337c">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/46ab2d46337c" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>