diff options
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py | 4 | ||||
| -rw-r--r-- | testsuite/common.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py index 58f844b3b..92d710f7d 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py @@ -88,7 +88,7 @@ class TestCfgBaseFileMatcher(TestSpecificData): mock_get_regex.reset_mock() match.reset_mock() match.return_value = True - self.assertTrue(self.test_obj.handles(evt)) + self.assertTrue(self.test_obj.handles(evt)) match.assert_called_with(evt.filename) else: match.return_value = False @@ -389,7 +389,7 @@ class TestCfgEntrySet(TestEntrySet): eset.bind_info_to_entry.assert_called_with(entry, metadata) eset._generate_data.assert_called_with(entry, metadata) self.assertFalse(eset._validate_data.called) - expected = lxml.etree.Element("Path", name="/text.txt") + expected = lxml.etree.Element("Path", name="/test.txt") expected.text = "data" self.assertXMLEqual(bound, expected) self.assertEqual(bound, entry) diff --git a/testsuite/common.py b/testsuite/common.py index 0cb457461..e26d0be61 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -267,7 +267,7 @@ class Bcfg2TestCase(unittest.TestCase): attributes. """ self.assertEqual(el1.tag, el2.tag, msg=msg) self.assertEqual(el1.text, el2.text, msg=msg) - self.assertItemsEqual(el1.attrib, el2.attrib, msg=msg) + self.assertItemsEqual(el1.attrib.items(), el2.attrib.items(), msg=msg) self.assertEqual(len(el1.getchildren()), len(el2.getchildren())) for child1 in el1.getchildren(): @@ -275,10 +275,11 @@ class Bcfg2TestCase(unittest.TestCase): self.assertIsNotNone(cname, msg="Element %s has no 'name' attribute" % child1.tag) - children2 = el2.xpath("*[@name='%s']" % cname) + children2 = el2.xpath("%s[@name='%s']" % (child1.tag, cname)) self.assertEqual(len(children2), 1, - msg="More than one element named %s" % cname) - self.assertXMLEqual(child1, children2[0], msg=msg) + msg="More than one %s element named %s" % \ + (child1.tag, cname)) + self.assertXMLEqual(child1, children2[0], msg=msg) class DBModelTestCase(Bcfg2TestCase): |