Merged revisions 78116 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78116 | michael.foord | 2010-02-08 22:41:16 +0000 (Mon, 08 Feb 2010) | 1 line

  Make assertMultiLineEqual the default for comparing unicode strings.
........
This commit is contained in:
Michael Foord 2010-02-08 23:10:39 +00:00
parent 4900823027
commit 0283495c30
3 changed files with 21 additions and 8 deletions

View file

@ -2795,8 +2795,9 @@ test case
try:
self.assertMultiLineEqual(sample_text, revised_sample_text)
except self.failureException as e:
# no fair testing ourself with ourself, use assertEqual..
self.assertEqual(sample_text_error, str(e))
# no fair testing ourself with ourself, and assertEqual is used for strings
# so can't use assertEqual either. Just use assertTrue.
self.assertTrue(sample_text_error == str(e))
def testAssertIsNone(self):
self.assertIsNone(None)