From e88c029c6fdbedb038443c8cbe52206d9ca9c1a2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 21 Mar 2013 14:35:11 -0400 Subject: fixed unit tests --- src/lib/Bcfg2/Client/Tools/__init__.py | 3 +-- src/lib/Bcfg2/Server/Core.py | 1 - src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 7 +++---- .../Testlib/TestClient/TestTools/Test_init.py | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index a4a68ea3b..27ca92472 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -141,7 +141,6 @@ class Tool(object): raise ToolInstantiationError("%s: %s not executable" % (self.name, filename)) - def BundleUpdated(self, bundle, states): # pylint: disable=W0613 """ Callback that is invoked when a bundle has been updated. @@ -562,7 +561,7 @@ class SvcTool(Tool): :returns: bool - True if the status command returned 0, False otherwise """ - return self.cmd.run(self.get_svc_command(service, 'status')) + return bool(self.cmd.run(self.get_svc_command(service, 'status'))) def Remove(self, services): if self.setup['servicemode'] != 'disabled': diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 0ded7ac26..06dfe7f25 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -329,7 +329,6 @@ class BaseCore(object): # enable debugging on everything else. self.plugins[plugin].set_debug(self.debug_flag) - def plugins_by_type(self, base_cls): """ Return a list of loaded plugins that match the passed type. diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 4cd938651..6b8ed1f7d 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -673,13 +673,13 @@ class YumCollection(Collection): if not ptype: ptype = "default" gdicts.append(dict(group=group, type=ptype)) - + if self.use_yum: return self.call_helper("get_groups", inputdata=gdicts) else: pkgs = dict() for gdict in gdicts: - pkgs[gdict['group']] = Collection.get_group(self, + pkgs[gdict['group']] = Collection.get_group(self, gdict['group'], gdict['type']) return pkgs @@ -1301,10 +1301,9 @@ class YumSource(Source): yumgroup = self.yumgroups[group] except KeyError: return [] - packages = yumgroup['conditional'] + yumgroup['mandatory'] + packages = yumgroup['conditional'] + yumgroup['mandatory'] if ptype in ['default', 'optional', 'all']: packages += yumgroup['default'] if ptype in ['optional', 'all']: packages += yumgroup['optional'] return packages - diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py index 19f76f2f1..390b92608 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py @@ -384,7 +384,7 @@ class TestPkgTool(TestTool): # test single-pass install success reset() - pt.cmd.run.return_value = (0, '') + pt.cmd.run.return_value = True states = dict([(p, False) for p in packages]) pt.Install(packages, states) pt._get_package_command.assert_called_with(packages) @@ -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,13 +526,13 @@ class TestSvcTool(TestTool): st.get_svc_command.reset_mock() st.cmd.reset_mock() - st.cmd.run.return_value = (0, '') + st.cmd.run.return_value = True self.assertEqual(st.check_service(service), True) 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, '') + st.cmd.run.return_value = False self.assertEqual(st.check_service(service), False) st.get_svc_command.assert_called_with(service, "status") st.cmd.run.assert_called_with(st.get_svc_command.return_value) @@ -559,7 +559,7 @@ class TestSvcTool(TestTool): st.stop_service.return_value = 0 st.restart_service = Mock() st.restart_service.side_effect = lambda e: \ - int(e.get("name") == "failed") + int(e.get("name") != "failed") def reset(): st.handlesEntry.reset_mock() -- cgit v1.2.3-1-g7c22