diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-18 13:37:39 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-18 13:37:39 -0600 |
| commit | 71d10f8cf1d76dfe82326e28da2f2224828ae93e (patch) | |
| tree | 8d3c1a5cf5c3ab2d2cfe6764aca7cb7fb20b606d /src | |
| parent | 05122a6f04fbbff9838816f6f713e483811c8ed5 (diff) | |
| download | bcfg2-71d10f8cf1d76dfe82326e28da2f2224828ae93e.tar.gz bcfg2-71d10f8cf1d76dfe82326e28da2f2224828ae93e.tar.bz2 bcfg2-71d10f8cf1d76dfe82326e28da2f2224828ae93e.zip | |
added unit tests for GroupPatterns
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/GroupPatterns.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py index 6f0695bc3..2e8c56b4e 100644 --- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py @@ -118,7 +118,8 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked): self.patterns.append(PatternMap(None, rng, groups)) except: # pylint: disable=W0702 self.logger.error("GroupPatterns: Failed to initialize " - "pattern %s" % entry.get('pattern')) + "pattern %s: %s" % (entry.text, + sys.exc_info()[1])) def process_patterns(self, hostname): """ return a list of groups that should be added to the given @@ -126,9 +127,9 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked): ret = [] for pattern in self.patterns: try: - grpname = pattern.process(hostname) - if grpname is not None: - ret.extend(grpname) + grps = pattern.process(hostname) + if grps is not None: + ret.extend(grps) except: # pylint: disable=W0702 self.logger.error("GroupPatterns: Failed to process pattern " "%s for %s" % (pattern.pattern, hostname), |