Run systemd-detect-virt

Add run_command() function.

Log also the "container" environment variable.

Author: vstinner

Lib/test/pythoninfo.py

@@ -9,6 +9,7 @@
 
 
 MS_WINDOWS = (sys.platform == "win32")
+COMMAND_TIMEOUT = 60.0
 
 
 def normalize_text(text):
@@ -356,6 +357,9 @@ def format_groups(groups):
         "_PYTHON_SYSCONFIGDATA_PATH",
         "__PYVENV_LAUNCHER__",
 
+        # Lower case variables
+        "container",
+
         # Sanitizer options
         "ASAN_OPTIONS",
         "LSAN_OPTIONS",
@@ -435,19 +439,40 @@ def format_attr(attr, value):
             info_add('readline.library', 'GNU readline')
 
 
-def collect_gdb(info_add):
+def run_command(cmd, **kwargs):
     import subprocess
+    timeout = COMMAND_TIMEOUT
 
     try:
-        proc = subprocess.Popen(["gdb", "-nx", "--version"],
+        proc = subprocess.Popen(cmd,
                                 stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                universal_newlines=True)
-        version = proc.communicate()[0]
+                                stderr=subprocess.DEVNULL,
+                                text=True,
+                                **kwargs)
+        # ignore stderr
+        with proc:
+            try:
+                stdout = proc.communicate(timeout=timeout)[0]
+            except:
+                proc.kill()
+                proc.communicate()
+                raise
+
         if proc.returncode:
-            # ignore gdb failure: test_gdb will log the error
-            return
+            return ''
+
+        # Strip trailing spaces and newlines
+        return stdout.rstrip()
     except OSError:
+        return ''
+    except subprocess.TimeoutExpired:
+        print(f"ERROR: Command {' '.join(cmd)}: timeout!")
+        return ''
+
+
+def collect_gdb(info_add):
+    version = run_command(["gdb", "-nx", "--version"])
+    if not version:
         return
 
     # Only keep the first line
@@ -848,7 +873,6 @@ def collect_support_threading_helper(info_add):
 
 
 def collect_cc(info_add):
-    import subprocess
     import sysconfig
 
     CC = sysconfig.get_config_var('CC')
@@ -861,19 +885,13 @@ def collect_cc(info_add):
     except ImportError:
         args = CC.split()
     args.append('--version')
-    try:
-        proc = subprocess.Popen(args,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT,
-                                universal_newlines=True)
-    except OSError:
+
+    stdout = run_command(args)
+    if not stdout:
         # Cannot run the compiler, for example when Python has been
         # cross-compiled and installed on the target platform where the
         # compiler is missing.
-        return
-
-    stdout = proc.communicate()[0]
-    if proc.returncode:
+        #
         # CC --version failed: ignore error
         return
 
@@ -979,21 +997,11 @@ def collect_windows(info_add):
         call_func(info_add, 'windows.oem_code_page', _winapi, 'GetOEMCP')
 
     # windows.version_caption: "wmic os get Caption,Version /value" command
-    import subprocess
-    try:
-        # When wmic.exe output is redirected to a pipe,
-        # it uses the OEM code page
-        proc = subprocess.Popen(["wmic", "os", "get", "Caption,Version", "/value"],
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                encoding="oem",
-                                text=True)
-        output, stderr = proc.communicate()
-        if proc.returncode:
-            output = ""
-    except OSError:
-        pass
-    else:
+    output = run_command(["wmic", "os", "get", "Caption,Version", "/value"],
+                         # When wmic.exe output is redirected to a pipe,
+                         # it uses the OEM code page
+                         encoding="oem")
+    if output:
         for line in output.splitlines():
             line = line.strip()
             if line.startswith('Caption='):
@@ -1006,23 +1014,11 @@ def collect_windows(info_add):
                     info_add('windows.version', line)
 
     # windows.ver: "ver" command
-    try:
-        proc = subprocess.Popen(["ver"], shell=True,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                text=True)
-        output = proc.communicate()[0]
-        if proc.returncode == 0xc0000142:
-            return
-        if proc.returncode:
-            output = ""
-    except OSError:
-        return
-    else:
-        output = output.strip()
-        line = output.splitlines()[0]
-        if line:
-            info_add('windows.ver', line)
+    output = run_command(["ver"], shell=True)
+    if output:
+        first_line = output.splitlines()[0]
+        if first_line:
+            info_add('windows.ver', first_line)
 
     # windows.developer_mode: get AllowDevelopmentWithoutDevLicense registry
     value = winreg_query(r"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows"
@@ -1136,11 +1132,21 @@ def get_machine_id():
 def is_running_in_container():
     # Check if the process in running in a container
     import os.path
+
     if os.path.exists('/.dockerenv'):
         return 'docker'
     if os.path.exists('/run/.containerenv'):
         return 'podman'
 
+    container = read_first_line('/run/systemd/container')
+    if container:
+        return container
+
+    # Run systemd-detect-virt command
+    container = run_command(["systemd-detect-virt"])
+    if container and container != "none":
+        return container
+
     # Other ways to check if running in a container:
     # * Parse /proc/1/mounts or /proc/1/mountinfo (check "/" filesystem).
     # * Parse /proc/1/cgroup.