diff options
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 | ||||
| -rwxr-xr-x | src/lib/Bcfg2/Server/Lint/Genshi.py | 3 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py | 25 |
4 files changed, 15 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index 41759655d..d197354a3 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -448,7 +448,7 @@ class PkgTool(Tool): self.logger.info("Trying single pass package install for pkgtype %s" % self.pkgtype) - if self.cmd.run(self.pkgtool[0] % pkgargs): + if self.cmd.run(self._get_package_command(packages)): self.logger.info("Single Pass Succeded") # set all package states to true and flush workqueues pkgnames = [pkg.get('name') for pkg in packages] diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 1b0ecadf5..07f9e0588 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -334,7 +334,7 @@ class BaseCore(object): continue self._update_vcs_revision() - @track_statistics() + @Bcfg2.Server.Statistics.track_statistics() def _update_vcs_revision(self): """ Update the revision of the current configuration on-disk from the VCS plugin """ diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py index ed0d9930f..caee238bc 100755 --- a/src/lib/Bcfg2/Server/Lint/Genshi.py +++ b/src/lib/Bcfg2/Server/Lint/Genshi.py @@ -4,7 +4,6 @@ import sys import Bcfg2.Server.Lint from genshi.template import TemplateLoader, NewTextTemplate, MarkupTemplate, \ TemplateSyntaxError -from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator @@ -43,7 +42,7 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin): for entry in self.core.plugins['Bundler'].entries.values(): if (self.HandlesFile(entry.name) and - isinstance(entry, BundleTemplateFile)): + entry.template is not None): try: loader.load(entry.name, cls=MarkupTemplate) except TemplateSyntaxError: diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py index 19f76f2f1..6fdafa2ab 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py @@ -399,9 +399,9 @@ class TestPkgTool(TestTool): def run(cmd): if "foo" in cmd: # fail when installing all packages, and when installing foo - return (1, '') + return False # succeed otherwise - return (0, '') + return True pt.VerifyPackage.side_effect = lambda p, m: p.get("name") == "bar" @@ -480,7 +480,7 @@ class TestSvcTool(TestTool): st.cmd = MagicMock() service = lxml.etree.Element("Service", name="foo", type="test") self.assertEqual(st.start_service(service), - st.cmd.run.return_value[0]) + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "start") st.cmd.run.assert_called_with(st.get_svc_command.return_value) @@ -490,7 +490,7 @@ class TestSvcTool(TestTool): st.cmd = MagicMock() service = lxml.etree.Element("Service", name="foo", type="test") self.assertEqual(st.stop_service(service), - st.cmd.run.return_value[0]) + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "stop") st.cmd.run.assert_called_with(st.get_svc_command.return_value) @@ -505,14 +505,14 @@ class TestSvcTool(TestTool): service = lxml.etree.Element("Service", name="foo", type="test") self.assertEqual(st.restart_service(service), - st.cmd.run.return_value[0]) + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "restart") st.cmd.run.assert_called_with(st.get_svc_command.return_value) reset() service.set('target', 'reload') self.assertEqual(st.restart_service(service), - st.cmd.run.return_value[0]) + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "reload") st.cmd.run.assert_called_with(st.get_svc_command.return_value) @@ -526,14 +526,14 @@ class TestSvcTool(TestTool): st.get_svc_command.reset_mock() st.cmd.reset_mock() - st.cmd.run.return_value = (0, '') - self.assertEqual(st.check_service(service), True) + self.assertEqual(st.check_service(service), + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "status") st.cmd.run.assert_called_with(st.get_svc_command.return_value) reset() - st.cmd.run.return_value = (11, '') - self.assertEqual(st.check_service(service), False) + self.assertEqual(st.check_service(service), + st.cmd.run.return_value) st.get_svc_command.assert_called_with(service, "status") st.cmd.run.assert_called_with(st.get_svc_command.return_value) @@ -556,10 +556,9 @@ class TestSvcTool(TestTool): st.handlesEntry = Mock() st.handlesEntry.side_effect = lambda e: e.tag == "Service" st.stop_service = Mock() - st.stop_service.return_value = 0 + st.stop_service.return_value = True st.restart_service = Mock() - st.restart_service.side_effect = lambda e: \ - int(e.get("name") == "failed") + st.restart_service.side_effect = lambda e: e.get("name") != "failed" def reset(): st.handlesEntry.reset_mock() |