summaryrefslogtreecommitdiffstats
path: root/testsuite/common.py
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/common.py')
-rw-r--r--testsuite/common.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/common.py b/testsuite/common.py
index 849c22ef3..5a08f8db5 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -129,8 +129,12 @@ class Bcfg2TestCase(TestCase):
"\nSecond: %s" % lxml.etree.tostring(el2)
self.assertEqual(el1.tag, el2.tag, msg=fullmsg % "Tags differ")
- self.assertEqual(el1.text, el2.text,
- msg=fullmsg % "Text content differs")
+ 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")
+ else:
+ self.assertEqual(el1.text, el2.text,
+ msg=fullmsg % "Text content differs")
self.assertItemsEqual(el1.attrib.items(), el2.attrib.items(),
msg=fullmsg % "Attributes differ")
self.assertEqual(len(el1.getchildren()),