mirror of
https://github.com/python/cpython.git
synced 2026-01-04 14:32:21 +00:00
[3.14] gh-134986: Catch PermissionError when trying to call perf in tests (GH-134987) (#135841)
gh-134986: Catch PermissionError when trying to call perf in tests (GH-134987)
Using Ubuntu 24.04 on the Windows Subsystem for Linux, perf will raise a
`PermissionError` instead of `FileNotFoundError`. This commit modifies
the tests to catch that.
(cherry picked from commit 6ab842fce5)
Co-authored-by: Emma Smith <emma@emmatyping.dev>
This commit is contained in:
parent
f0a330e5fb
commit
85fbf80ca2
1 changed files with 4 additions and 1 deletions
|
|
@ -506,9 +506,12 @@ def _is_perf_version_at_least(major, minor):
|
|||
# The output of perf --version looks like "perf version 6.7-3" but
|
||||
# it can also be perf version "perf version 5.15.143", or even include
|
||||
# a commit hash in the version string, like "6.12.9.g242e6068fd5c"
|
||||
#
|
||||
# PermissionError is raised if perf does not exist on the Windows Subsystem
|
||||
# for Linux, see #134987
|
||||
try:
|
||||
output = subprocess.check_output(["perf", "--version"], text=True)
|
||||
except (subprocess.CalledProcessError, FileNotFoundError):
|
||||
except (subprocess.CalledProcessError, FileNotFoundError, PermissionError):
|
||||
return False
|
||||
version = output.split()[2]
|
||||
version = version.split("-")[0]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue