diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-08-26 19:33:00 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-08-26 20:28:36 +0200 |
| commit | 3259a1611edf97241b3a2d1bd585185907fe4e9c (patch) | |
| tree | 4572499b48b473d2a0b73747586fa87efd317ebc | |
| parent | 6851a2931869aa9d9181b7b2d95f048aa5415a23 (diff) | |
| download | bcfg2-3259a1611edf97241b3a2d1bd585185907fe4e9c.tar.gz bcfg2-3259a1611edf97241b3a2d1bd585185907fe4e9c.tar.bz2 bcfg2-3259a1611edf97241b3a2d1bd585185907fe4e9c.zip | |
testsuite: Fix debug messages to handle xml with a '%' inside
| -rw-r--r-- | testsuite/common.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/testsuite/common.py b/testsuite/common.py index 4c7337e0d..bdf0c01cb 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -171,21 +171,22 @@ class Bcfg2TestCase(TestCase): msg = "XML trees are not equal: %s" else: msg += ": %s" - fullmsg = msg + "\nFirst: %s" % lxml.etree.tostring(el1) + \ + msg += "\n%s" + fullmsg = "First: %s" % lxml.etree.tostring(el1) + \ "\nSecond: %s" % lxml.etree.tostring(el2) - self.assertEqual(el1.tag, el2.tag, msg=fullmsg % "Tags differ") + self.assertEqual(el1.tag, el2.tag, msg=msg % ("Tags differ", fullmsg)) if el1.text is not None and el2.text is not None: self.assertEqual(el1.text.strip(), el2.text.strip(), - msg=fullmsg % "Text content differs") + msg=msg % ("Text content differs", fullmsg)) else: self.assertEqual(el1.text, el2.text, - msg=fullmsg % "Text content differs") + msg=msg % ("Text content differs", fullmsg)) self.assertItemsEqual(el1.attrib.items(), el2.attrib.items(), - msg=fullmsg % "Attributes differ") + msg=msg % ("Attributes differ", fullmsg)) self.assertEqual(len(el1.getchildren()), len(el2.getchildren()), - msg=fullmsg % "Different numbers of children") + msg=msg % ("Different numbers of children", fullmsg)) matched = [] for child1 in el1.getchildren(): for child2 in el2.xpath(child1.tag): @@ -199,10 +200,10 @@ class Bcfg2TestCase(TestCase): continue else: assert False, \ - fullmsg % ("Element %s is missing from second" % - lxml.etree.tostring(child1)) + msg % ("Element %s is missing from second" % + lxml.etree.tostring(child1), fullmsg) self.assertItemsEqual(el2.getchildren(), matched, - msg=fullmsg % "Second has extra element(s)") + msg=msg % ("Second has extra element(s)", fullmsg)) class DBModelTestCase(Bcfg2TestCase): |