PR comments

Signed-off-by: BenjiReis <[email protected]>

SOURCES/etc/xapi.d/plugins/xcpngutils/__init__.py

@@ -71,8 +71,7 @@ def __init__(self, code, command, stderr, stdout):
         self.stdout = stdout
 
     def __str__(self):
-        return f"Command {self.command} failed with code: {self.returncode} and stderr: {self.stderr}," + \
-            f" stdout: {self.stdout}"
+        return f"Command '{self.command}' failed with code: {self.returncode}"
 
 def run_command(command, check=True):
     process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -137,7 +136,8 @@ def wrapper(*args, **kwds):
         except ProcessException as e:
             raise_plugin_error(e.returncode, str(e), backtrace=traceback.format_exc())
         except Exception as e:
-            raise_plugin_error('-1', str(e), backtrace=traceback.format_exc())
+            raise_plugin_error(
+                '-1', str(e), detail=f"stdout: '{e.stdout}', stderr: '{e.stderr}'", backtrace=traceback.format_exc())
 
     return wrapper
 

tests/test_raid.py

@@ -62,7 +62,7 @@ def test_raid_error(self, run_command, fs):
         assert e.value.params[1] == 'Error!'
 
     def test_raid_missing(self, run_command, fs):
-        run_command.side_effect = ProcessException(1, MDADM_DETAIL_CMD, "", "")
+        run_command.side_effect = ProcessException(1, MDADM_DETAIL_CMD, "stderr", "stdout")
         res = check_raid_pool(None, None)
         assert json.loads(res) == json.loads("{}")
         run_command.assert_called_once_with(MDADM_DETAIL_CMD)