From 89ddbdac554c806147805c47d5b3ceabaa6739f0 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 3 Dec 2012 19:50:53 -0600 Subject: fixed SELinux tool/plugin tests --- .../TestServer/TestPlugins/TestSEModules.py | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'testsuite') diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py index 8a148b353..66492f8b2 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py @@ -38,34 +38,29 @@ class TestSEModules(TestGroupSpool): def test__get_module_name(self): modules = self.get_obj() for mname in ["foo", "foo.pp"]: - entry = lxml.etree.Element("SELinux", type="module", name=mname) + entry = lxml.etree.Element("SEModule", type="module", name=mname) self.assertEqual(modules._get_module_name(entry), "foo") def test__get_module_filename(self): modules = self.get_obj() for mname in ["foo", "foo.pp"]: - entry = lxml.etree.Element("SELinux", type="module", name=mname) + entry = lxml.etree.Element("SEModule", type="module", name=mname) self.assertEqual(modules._get_module_filename(entry), "/foo.pp") def test_HandlesEntry(self): modules = self.get_obj() modules._get_module_filename = Mock() - modules.Entries['SELinux']['/foo.pp'] = Mock() - modules.Entries['SELinux']['/bar.pp'] = Mock() + modules.Entries['SEModule']['/foo.pp'] = Mock() + modules.Entries['SEModule']['/bar.pp'] = Mock() for el in [lxml.etree.Element("Path", name="foo.pp"), - lxml.etree.Element("SELinux", type="fcontext", - name="foo.pp"), - lxml.etree.Element("SELinux", type="module", - name="baz.pp")]: + lxml.etree.Element("SEModule", name="baz.pp")]: modules._get_module_filename.return_value = "/" + el.get("name") self.assertFalse(modules.HandlesEntry(el, Mock())) - if el.get("type") == "module": + if el.tag == "SEModule": modules._get_module_filename.assert_called_with(el) - for el in [lxml.etree.Element("SELinux", type="module", - name="foo.pp"), - lxml.etree.Element("SELinux", type="module", - name="bar.pp")]: + for el in [lxml.etree.Element("SEModule", name="foo.pp"), + lxml.etree.Element("SEModule", name="bar.pp")]: modules._get_module_filename.return_value = "/" + el.get("name") self.assertTrue(modules.HandlesEntry(el, Mock()), msg="SEModules fails to handle %s" % el.get("name")) @@ -77,10 +72,10 @@ class TestSEModules(TestGroupSpool): modules = self.get_obj() modules._get_module_name = Mock() handler = Mock() - modules.Entries['SELinux']['/foo.pp'] = handler + modules.Entries['SEModule']['/foo.pp'] = handler modules._get_module_name.return_value = "foo" - entry = lxml.etree.Element("SELinux", type="module", name="foo") + entry = lxml.etree.Element("SEModule", type="module", name="foo") metadata = Mock() self.assertEqual(modules.HandleEntry(entry, metadata), handler.return_value) -- cgit v1.2.3-1-g7c22