8000 gh-119273: Don't run test_ioctl in a process group by vstinner · Pull Request #119275 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-119273: Don't run test_ioctl in a process group #119275

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
merged 1 commit into from
May 29, 2024
Merged

gh-119273: Don't run test_ioctl in a process group #119275

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions Lib/test/libregrtest/run_workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,20 @@ def _kill(self) -> None:
return
self._killed = True

if USE_PROCESS_GROUP:
use_killpg = USE_PROCESS_GROUP
if use_killpg:
parent_sid = os.getsid(0)
sid = os.getsid(popen.pid)
use_killpg = (sid != parent_sid)

if use_killpg:
what = f"{self} process group"
else:
what = f"{self} process"

print(f"Kill {what}", file=sys.stderr, flush=True)
try:
if USE_PROCESS_GROUP:
if use_killpg:
os.killpg(popen.pid, signal.SIGKILL)
else:
popen.kill()
Expand Down
8 changes: 7 additions & 1 deletion Lib/test/libregrtest/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@


USE_PROCESS_GROUP = (hasattr(os, "setsid") and hasattr(os, "killpg"))
NEED_TTY = set('''
test_ioctl
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a couple of other tests that skip some of the test methods/classes when stdout is not a tty: test_builtin, test_curses, test_os, test_shutil at least, from a quick grep. I'm not sure it's going to be maintainable to keep a list like this up to date...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One option would be to move "tty" tests in separated test files and disable setsid() if the test name contains _tty. For example, we already do that with GUI tests (ex: test_ttk and test_ttk_textonly).

'''.split())


def create_worker_process(runtests: WorkerRunTests, output_fd: int,
Expand Down Expand Up @@ -47,7 +50,10 @@ def create_worker_process(runtests: WorkerRunTests, output_fd: int,
close_fds=True,
cwd=work_dir,
)
if USE_PROCESS_GROUP:

# Don't use setsid() in tests using TTY
test_name = runtests.tests[0]
if USE_PROCESS_GROUP and test_name not in NEED_TTY:
kwargs['start_new_session'] = True

# Pass json_file to the worker process
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Tests/2024-05-20-18-06-31.gh-issue-119273.hf-yhX.rst
View file 5CC5
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Python test runner no longer runs tests using TTY (ex: test_ioctl) in a
process group (using ``setsid()``). Previously, tests using TTY were
skipped. Patch by Victor Stinner.
Loading
0