[Python-checkins] r87379 - in python/branches/release31-maint: Lib/test/test_unittest.py Lib/unittest.py
ezio.melotti
python-checkins at python.org
Sat Dec 18 18:55:43 CET 2010
Author: ezio.melotti
Date: Sat Dec 18 18:55:43 2010
New Revision: 87379
Log:
Merged revisions 87377 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87377 | ezio.melotti | 2010-12-18 18:31:58 +0100 (Sat, 18 Dec 2010) | 1 line
Use lowercase true/false in assertTrue/assertFalse messages.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_unittest.py
python/branches/release31-maint/Lib/unittest.py
Modified: python/branches/release31-maint/Lib/test/test_unittest.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_unittest.py (original)
+++ python/branches/release31-maint/Lib/test/test_unittest.py Sat Dec 18 18:55:43 2010
@@ -3010,13 +3010,13 @@
def testAssertTrue(self):
self.assertMessages('assertTrue', (False,),
- ["^False is not True$", "^oops$", "^False is not True$",
- "^False is not True : oops$"])
+ ["^False is not true$", "^oops$", "^False is not true$",
+ "^False is not true : oops$"])
def testAssertFalse(self):
self.assertMessages('assertFalse', (True,),
- ["^True is not False$", "^oops$", "^True is not False$",
- "^True is not False : oops$"])
+ ["^True is not false$", "^oops$", "^True is not false$",
+ "^True is not false : oops$"])
def testNotEqual(self):
self.assertMessages('assertNotEqual', (1, 1),
Modified: python/branches/release31-maint/Lib/unittest.py
==============================================================================
--- python/branches/release31-maint/Lib/unittest.py (original)
+++ python/branches/release31-maint/Lib/unittest.py Sat Dec 18 18:55:43 2010
@@ -540,15 +540,15 @@
raise self.failureException(msg)
def assertFalse(self, expr, msg=None):
- "Fail the test if the expression is true."
+ """Check that the expression is false."""
if expr:
- msg = self._formatMessage(msg, "%r is not False" % expr)
+ msg = self._formatMessage(msg, "%r is not false" % expr)
raise self.failureException(msg)
def assertTrue(self, expr, msg=None):
- """Fail the test unless the expression is true."""
+ """Check that the expression is true."""
if not expr:
- msg = self._formatMessage(msg, "%r is not True" % expr)
+ msg = self._formatMessage(msg, "%r is not true" % expr)
raise self.failureException(msg)
def _formatMessage(self, msg, standardMsg):
More information about the Python-checkins
mailing list