Merge branch 'xlf_dev' of https://github.com/xianglongfei-8888/avocado into xlf_dev

Author: xianglongfei

avocado/core/sysinfo.py

@@ -83,7 +83,7 @@ def __init__(self, basedir=None, log_packages=None, profiler=None):
         else:
             log.debug("sudo_distros config is empty or missing")
 
-        def _load_sudo_list(raw_value, key): 
+        def _load_sudo_list(raw_value, key):
             # pylint: disable=wrong-spelling-in-docstring
             """
             If `raw_value` is a path to an INI file, read `[sysinfo] / key`
@@ -110,47 +110,6 @@ def _load_sudo_list(raw_value, key):
             dst.strip().lower() for dst in sudo_distros_value.split(",") if dst.strip()
         }
 
-        # Retrieve the configured paths for sudo commands and distros from the settings dictionary
-        sudo_commands_conf = self.config.get("sysinfo.sudo_commands", "")
-        sudo_distros_conf = self.config.get("sysinfo.sudo_distros", "")
-
-        if sudo_commands_conf:
-            log.info("sudo_commands loaded from config: %s", sudo_commands_conf)
-        else:
-            log.debug("sudo_commands config is empty or missing")
-
-        if sudo_distros_conf:
-            log.info("sudo_distros loaded from config: %s", sudo_distros_conf)
-        else:
-            log.debug("sudo_distros config is empty or missing")
-
-        def _load_sudo_list(raw_value, key):
-            # pylint: disable=wrong-spelling-in-docstring
-            """
-            If `raw_value` is a path to an INI file, read `[sysinfo] / key`
-            from it; otherwise, treat `raw_value` itself as a CSV list.
-            """
-            if not raw_value:
-                return ""
-            if os.path.isfile(raw_value):
-                config = configparser.ConfigParser()
-                config.read(raw_value)
-                return config.get("sysinfo", key, fallback="")
-            return raw_value
-
-        # Retrieve the actual sudo commands and distros values from the config files,
-        # falling back to empty string if the keys are missing
-        sudo_commands_value = _load_sudo_list(sudo_commands_conf, "sudo_commands")
-        sudo_distros_value = _load_sudo_list(sudo_distros_conf, "sudo_distros")
-
-        self.sudo_commands = {
-            cmd.strip().lower() for cmd in sudo_commands_value.split(",") if cmd.strip()
-        }
-
-        self.sudo_distros = {
-            dst.strip().lower() for dst in sudo_distros_value.split(",") if dst.strip()
-        }
-
         if basedir is None:
             basedir = utils_path.init_dir("sysinfo")
         self.basedir = basedir

avocado/utils/sysinfo.py

@@ -146,6 +146,13 @@ def __init__(
         self.locale = locale
         self.sudo_commands = sudo_commands
         self.sudo_distros = sudo_distros
+        self._sysinfo_cmd = None
+
+    @property
+    def _sudoer(self):
+        if self._sysinfo_cmd is None and self.sudo_commands and self.sudo_distros:
+            self._sysinfo_cmd = SysinfoCommand(self.sudo_commands, self.sudo_distros)
+        return self._sysinfo_cmd
 
     def __repr__(self):
         r = "Command(%r, %r)"
@@ -179,9 +186,8 @@ def collect(self):
 
         # Determine whether to run with sudo (do not mutate the command string)
         sudo_flag = False
-        if self.sudo_commands and self.sudo_distros:
-            sysinfo_cmd = SysinfoCommand(self.sudo_commands, self.sudo_distros)
-            sudo_flag = sysinfo_cmd.use_sudo() and sysinfo_cmd.is_sudo_cmd(self.cmd)
+        if self._sudoer:
+            sudo_flag = self._sudoer.use_sudo() and self._sudoer.is_sudo_cmd(self.cmd)
         log.info("Executing Command%s: %s", " (sudo)" if sudo_flag else "", self.cmd)
 
         try: