Fixed the issue in sysinfo where the dmidecode and fdisk -l commands were executed.

Signed-off-by: xianglongfei <xianglongfei@uniontech.com>

Author: xianglongfei

avocado/core/sysinfo.py

@@ -11,11 +11,11 @@
 # This code was inspired in the autotest project,
 # client/shared/settings.py
 # Author: John Admanski <jadmanski@google.com>
+import configparser
 import filecmp
 import logging
 import os
 import time
-import configparser
 
 from avocado.core import output
 from avocado.core.settings import settings
@@ -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`
@@ -92,9 +92,9 @@ def _load_sudo_list(raw_value, key):
             if not raw_value:
                 return ""
             if os.path.isfile(raw_value):
-                config = configparser.ConfigParser()
-                config.read(raw_value)
-                return config.get("sysinfo", key, fallback="")
+                parser = configparser.ConfigParser()
+                parser.read(raw_value)
+                return parser.get("sysinfo", key, fallback="")
             return raw_value
 
         # Retrieve the actual sudo commands and distros values from the config files,

avocado/utils/sysinfo.py

@@ -14,14 +14,14 @@
 #          John Admanski <jadmanski@google.com>
 
 import json
+import logging
 import os
+import platform
 import shlex
 import subprocess
 import tempfile
-import platform
-import logging
-
 from abc import ABC, abstractmethod
+
 from avocado.utils import astring, process
 from avocado.utils.process import can_sudo
 
@@ -138,14 +138,21 @@ class Command(Collectible):
 
     def __init__(
         self, cmd, timeout=-1, locale="C", sudo_commands=None, sudo_distros=None
-    ): # pylint: disable=R0913
+    ):  # pylint: disable=R0913
         super().__init__(cmd)
         self._name = self.log_path
         self.cmd = cmd
         self.timeout = timeout
         self.locale = locale
         self.sudo_commands = sudo_commands
         self.sudo_distros = sudo_distros
+        self._sysinfo_cmd = None
+
+    @property
+    def _sudo_helper(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._sudo_helper:
+            sudo_flag = self._sudo_helper.use_sudo() and self._sudo_helper.is_sudo_cmd(self.cmd)
         log.info("Executing Command%s: %s", " (sudo)" if sudo_flag else "", self.cmd)
 
         try: