From 5eee7729c3d63cace3c547a181977bdf4bd3cbaf Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Nov 2013 16:56:34 +0100 Subject: [PATCH] test: better ignore_blank in helpers's assertEqualXML --- src/test/helpers.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/helpers.py b/src/test/helpers.py index 071eff27..9504b243 100644 --- a/src/test/helpers.py +++ b/src/test/helpers.py @@ -143,6 +143,15 @@ class SatTestCase(unittest.TestCase): def assertEqualXML(self, xml, expected, ignore_blank = False): def equalElt(got_elt, exp_elt): + if ignore_blank: + for elt in got_elt, exp_elt: + for attr in ('text','tail'): + value = getattr(elt, attr) + try: + value = value.strip() or None + except AttributeError: + value = None + setattr(elt, attr, value) if (got_elt.tag != exp_elt.tag): print "XML are not equals (elt %s/%s):" % (got_elt, exp_elt) print "tag: got [%s] expected: [%s]" % (got_elt.tag, exp_elt.tag)