diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-03 19:50:53 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-03 19:51:05 -0600 |
| commit | 89ddbdac554c806147805c47d5b3ceabaa6739f0 (patch) | |
| tree | 8a7a833af7083122a5259306bcbf089b39e3e0ae | |
| parent | d4f4167889ea5a293ba85b4e4f6ae477ecf3487b (diff) | |
| download | bcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.tar.gz bcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.tar.bz2 bcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.zip | |
fixed SELinux tool/plugin tests
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/SELinux.py | 8 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py | 25 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py index 7aa0e8a20..6bd728114 100644 --- a/src/lib/Bcfg2/Client/Tools/SELinux.py +++ b/src/lib/Bcfg2/Client/Tools/SELinux.py @@ -93,8 +93,12 @@ class SELinux(Bcfg2.Client.Tools.Tool): return self.GenericSEVerify elif attr.startswith("InstallSE"): return self.GenericSEInstall - else: - return object.__getattr__(self, attr) + # there's no need for an else here, because python checks for + # an attribute in the "normal" ways first. i.e., if self.txn + # is used, __getattr__() is never called because txn exists as + # a "normal" attribute of this object. See + # http://docs.python.org/2/reference/datamodel.html#object.__getattr__ + # for details def BundleUpdated(self, _, states): for handler in self.handlers.values(): 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) |