diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-21 14:35:11 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-21 14:35:11 -0400 |
| commit | e88c029c6fdbedb038443c8cbe52206d9ca9c1a2 (patch) | |
| tree | 76e5d2ac7c9045007008a6f8a9dbafe349e6561d /src | |
| parent | 38f99b402d3118e2c26ff42d72ddf9b666adac13 (diff) | |
| download | bcfg2-e88c029c6fdbedb038443c8cbe52206d9ca9c1a2.tar.gz bcfg2-e88c029c6fdbedb038443c8cbe52206d9ca9c1a2.tar.bz2 bcfg2-e88c029c6fdbedb038443c8cbe52206d9ca9c1a2.zip | |
fixed unit tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 1 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 7 |
3 files changed, 4 insertions, 7 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 - |