diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-02-08 23:10:39 (GMT) |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-02-08 23:10:39 (GMT) |
| commit | 0283495c305befb0926312c75e2d2ffaec428ab8 (patch) | |
| tree | 857964c1c0bc76aabb4a025bdad9cfc83ba8feb6 /Lib/test/test_unittest.py | |
| parent | 490082302779decbaf66a80480ae45fba6ae0e20 (diff) | |
| download | cpython-0283495c305befb0926312c75e2d2ffaec428ab8.zip cpython-0283495c305befb0926312c75e2d2ffaec428ab8.tar.gz cpython-0283495c305befb0926312c75e2d2ffaec428ab8.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/test/test_unittest.py')
| -rw-r--r-- | Lib/test/test_unittest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index c944217..e5219fd 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -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) |