reverted not needed changes.

Author: guettli

Tests/kaas/sonobuoy_handler/sonobuoy_handler.py

@@ -15,20 +15,18 @@
 
 def _find_sonobuoy():
     """find sonobuoy in PATH, but also in a fixed location at ~/.local/bin to simplify use with Ansible"""
-    result = shutil.which("sonobuoy")
+    result = shutil.which('sonobuoy')
     if result:
         return result
-    logger.debug("sonobuoy not in PATH, trying $HOME/.local/bin")
-    result = os.path.join(os.path.expanduser("~"), ".local", "bin", "sonobuoy")
+    logger.debug('sonobuoy not in PATH, trying $HOME/.local/bin')
+    result = os.path.join(os.path.expanduser('~'), '.local', 'bin', 'sonobuoy')
     if os.path.exists(result):
         return result
-    logger.debug("sonobuoy executable not found; expect errors")
+    logger.debug('sonobuoy executable not found; expect errors')
 
 
 def _fmt_result(counter):
-    return ", ".join(
-        f"{counter.get(key, 0)} {key}" for key in ("passed", "failed", "skipped")
-    )
+    return ', '.join(f"{counter.get(key, 0)} {key}" for key in ('passed', 'failed', 'skipped'))
 
 
 class SonobuoyHandler:
@@ -79,7 +77,7 @@ def _sonobuoy_delete(self):
     def _eval_result(self, counter):
         """evaluate test results and return return code"""
         result_message = f"sonobuoy reports {_fmt_result(counter)}"
-        if counter["failed"]:
+        if counter['failed']:
             logger.error(result_message)
             return 3
         logger.info(result_message)
@@ -92,7 +90,7 @@ def _preflight_check(self):
         if not self.sonobuoy:
             raise RuntimeError("sonobuoy executable not found; is it in PATH?")
 
-    def _sonobuoy_retrieve_result(self, plugin="e2e"):
+    def _sonobuoy_retrieve_result(self, plugin='e2e'):
         """
         Invoke sonobuoy to retrieve results and to store them in a subdirectory of
         the working directory. Analyze the results yaml file for given `plugin` and
@@ -103,7 +101,7 @@ def _sonobuoy_retrieve_result(self, plugin="e2e"):
         os.makedirs(result_dir, exist_ok=True)
 
         self._invoke_sonobuoy("retrieve", "-x", result_dir)
-        yaml_path = os.path.join(result_dir, "plugins", plugin, "sonobuoy_results.yaml")
+        yaml_path = os.path.join(result_dir, 'plugins', plugin, 'sonobuoy_results.yaml')
         logger.debug(f"parsing results from {yaml_path}")
 
         return sonobuoy_parse_result(plugin, yaml_path, self.sonobuoy_config)