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.
........
This commit is contained in:
Ezio Melotti 2010-12-18 17:55:43 +00:00
parent 28b77ece82
commit a2eb94b1cf
2 changed files with 8 additions and 8 deletions

View File

@ -3010,13 +3010,13 @@ class TestLongMessage(TestCase):
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),

View File

@ -540,15 +540,15 @@ class TestCase(object):
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):