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.
........
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 6e7dd24..3940daa 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -393,15 +393,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, "%s is not False" % safe_repr(expr))
+ msg = self._formatMessage(msg, "%s is not false" % safe_repr(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, "%s is not True" % safe_repr(expr))
+ msg = self._formatMessage(msg, "%s is not true" % safe_repr(expr))
raise self.failureException(msg)
def _formatMessage(self, msg, standardMsg):
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py
index 1e40789..e85ca91 100644
--- a/Lib/unittest/test/test_assertions.py
+++ b/Lib/unittest/test/test_assertions.py
@@ -165,13 +165,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),