summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCaio Ariede <caio.ariede@gmail.com>2015-08-02 17:07:31 -0300
committerTim Graham <timograham@gmail.com>2015-08-04 09:16:34 -0400
commit62d4074005f68328b240ab5f4fdfe348896717da (patch)
treee8238311733c0ada156c2f7838f3516a4c67018b /django
parentc6c00fbfbb659de4beaad3c612c271ac74f892a7 (diff)
Fixed #25191 -- Added string diff to SimpleTestCase.assertXMLEqual() message.
Diffstat (limited to 'django')
-rw-r--r--django/test/testcases.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index eed67e9cda..93ad8b9354 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -784,6 +784,13 @@ class SimpleTestCase(unittest.TestCase):
else:
if not result:
standardMsg = '%s != %s' % (safe_repr(xml1, True), safe_repr(xml2, True))
+ diff = ('\n' + '\n'.join(
+ difflib.ndiff(
+ six.text_type(xml1).splitlines(),
+ six.text_type(xml2).splitlines(),
+ )
+ ))
+ standardMsg = self._truncateMessage(standardMsg, diff)
self.fail(self._formatMessage(msg, standardMsg))
def assertXMLNotEqual(self, xml1, xml2, msg=None):