Cfg: better error handling from verifiers, :test

2 files changed, 14 insertions, 7 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
index b702ac899..8e2d98db9 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
@@ -23,10 +23,18 @@ class CfgExternalCommandVerifier(CfgVerifier):
     def verify_entry(self, entry, metadata, data):
         try:
             proc = Popen(self.cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-            err = proc.communicate(input=data)[1]
+            out, err = proc.communicate(input=data)
             rv = proc.wait()
             if rv != 0:
-                raise CfgVerificationError(err)
+                if not err:
+                    if out:
+                        # got nothing on stderr, try stdout
+                        err = out
+                    else:
+                        err = "Non-zero return value %s" % rv
+                raise CfgVerificationError(err.strip())
+        except CfgVerificationError:
+            raise
         except:
             err = sys.exc_info()[1]
             raise CfgVerificationError("Error running external command "
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index fcfaa393b..ec3ba222c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -589,11 +589,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
             try:
                 self._validate_data(entry, metadata, data)
             except CfgVerificationError:
-                msg = "Data for %s for %s failed to verify: %s" % \
-                    (entry.get('name'), metadata.hostname,
-                     sys.exc_info()[1])
-                self.logger.error(msg)
-                raise PluginExecutionError(msg)
+                raise PluginExecutionError("Failed to verify %s for %s: %s" %
+                                           (entry.get('name'),
+                                            metadata.hostname,
+                                            sys.exc_info()[1]))
 
         if entry.get('encoding') == 'base64':
             data = b64encode(data)