Skip to content

[3.15] gh-151496: Use process groups in TraceBackend in test_dtrace (GH-152039) #152082

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 1 commit into from
Jun 24, 2026
+24 −11
Merged

[3.15] gh-151496: Use process groups in TraceBackend in test_dtrace (GH-152039) #152082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 24 additions & 11 deletions Lib/test/test_dtrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ class TraceBackend:
COMMAND_ARGS = []

def run_case(self, name, optimize_python=None):
actual_output = normalize_trace_output(self.trace_python(
script_file=abspath(name + self.EXTENSION),
python_file=abspath(name + ".py"),
optimize_python=optimize_python))
try:
actual_output = normalize_trace_output(self.trace_python(
script_file=abspath(name + self.EXTENSION),
python_file=abspath(name + ".py"),
optimize_python=optimize_python))
except subprocess.TimeoutExpired:
raise AssertionError(f"{self.COMMAND[0]} timed out")

with open(abspath(name + self.EXTENSION + ".expected")) as f:
expected_output = f.read().rstrip()
Expand All @@ -91,25 +94,35 @@ def generate_trace_command(self, script_file, subcommand=None):
command += ["-c", subcommand]
return command

def trace(self, script_file, subcommand=None):
def trace(self, script_file, subcommand=None, *, timeout=None):
command = self.generate_trace_command(script_file, subcommand)
stdout, _ = subprocess.Popen(command,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True).communicate()
proc = create_process_group(command,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True)
try:
stdout, _ = proc.communicate(timeout=timeout)
except subprocess.TimeoutExpired:
kill_process_group(proc)
raise
return stdout

def trace_python(self, script_file, python_file, optimize_python=None):
python_flags = []
if optimize_python:
python_flags.extend(["-O"] * optimize_python)
subcommand = " ".join([sys.executable] + python_flags + [python_file])
return self.trace(script_file, subcommand)
return self.trace(script_file, subcommand, timeout=60)

def assert_usable(self):
try:
output = self.trace(abspath("assert_usable" + self.EXTENSION))
output = self.trace(abspath("assert_usable" + self.EXTENSION),
timeout=10)
output = output.strip()
except subprocess.TimeoutExpired:
raise unittest.SkipTest(
f"{self.COMMAND[0]} timed out during usability check"
)
except (FileNotFoundError, NotADirectoryError, PermissionError) as fnfe:
output = str(fnfe)
if output != "probe: success":
Expand Down
Loading