Skip to content

gh-152680: Check if running in a container/VM in test.pythoninfo #152668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 9 commits into from
Jun 30, 2026
Merged

gh-152680: Check if running in a container/VM in test.pythoninfo #152668

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b40dff
gh-152680: Check if running in a container/VM in test.pythoninfo
vstinner Jun 30, 2026
fa61ac8
Log run_command() errors
vstinner Jun 30, 2026
5490926
DEBUG: log run_command() output
vstinner Jun 30, 2026
ebe2429
DEBUG; log "sysctl -n hw.model" on Apple
vstinner Jun 30, 2026
bf2f058
log kern.hv_vmm_present
vstinner Jun 30, 2026
f60c855
More bugfixes
vstinner Jun 30, 2026
54b964b
Add first_line() function
vstinner Jun 30, 2026
a49567e
Remove outdated comment
vstinner Jun 30, 2026
64a5ced
Fix os.environ[container]
vstinner Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More bugfixes 
* Fix ver command
* Fix kern.hv_vmm_present test
* Log also IMAGE_OS_VERSION env var.
* Remove debug messages
  • Loading branch information
@vstinner
vstinner committed Jun 30, 2026
commit f60c855384803f511fc3c59a15b70e25d74a4b79
9 changes: 5 additions & 4 deletions Lib/test/pythoninfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ def format_groups(groups):
"HOMEDRIVE",
"HOMEPATH",
"IDLESTARTUP",
"IMAGE_OS_VERSION",
"IPHONEOS_DEPLOYMENT_TARGET",
"LANG",
"LDFLAGS",
Expand Down Expand Up @@ -466,11 +467,9 @@ def run_command(cmd, check=True, **kwargs):
return ''

# Strip trailing spaces and newlines
print(f"DEBUG: Command {cmd_str} succeeded: {stdout!r}")
stdout = stdout.rstrip()
return stdout
except FileNotFoundError as exc:
print(f"DEBUG: Command {cmd_str} failed with: {exc!r}")
except FileNotFoundError:
return ''
except OSError as exc:
print(f"Command {cmd_str} failed with: {exc!r}")
Expand Down Expand Up @@ -1025,6 +1024,8 @@ def collect_windows(info_add):

# windows.ver: "ver" command
output = run_command(["ver"], shell=True)
# "ver" output starts with an empty line: remove it
output = output.strip()
if output:
first_line = output.splitlines()[0]
if first_line:
Expand Down Expand Up @@ -1157,7 +1158,7 @@ def detect_virt():
return container

if APPLE:
hv_vmm_present = run_command(['sysctl', 'kern.hv_vmm_present'])
hv_vmm_present = run_command(['sysctl', '-n', 'kern.hv_vmm_present'])
if hv_vmm_present == '1':
return 'run in a VM (kern.hv_vmm_present is 1)'

Expand Down
Loading