Skip to content

gh-109888: Fix test_os _kill_with_event() on Windows #110421

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
Oct 5, 2023
Merged

gh-109888: Fix test_os _kill_with_event() on Windows #110421

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
gh-109888: Fix test_os _kill_with_event() on Windows 
Replace os.kill() with proc.kill() which catchs PermissionError.

Rewrite _kill_with_event():

* Use subprocess context manager ("with proc:").
* Use sleeping_retry() to wait until the child process is ready.
* Replace SIGINT with proc.kill() on error.
* Replace 10 seconds with SHORT_TIMEOUT to wait until the process is
  ready.
* Replace 0.5 seconds with SHORT_TIMEOUT to wait for the process
  exit.
  • Loading branch information
@vstinner
vstinner committed Oct 5, 2023
commit 5808d46f8520f6457c69a9658e281414fc13963b
50 changes: 27 additions & 23 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2566,30 +2566,34 @@ def _kill_with_event(self, event, name):
tagname = "test_os_%s" % uuid.uuid1()
m = mmap.mmap(-1, 1, tagname)
m[0] = 0

# Run a script which has console control handling enabled.
proc = subprocess.Popen([sys.executable,
os.path.join(os.path.dirname(__file__),
"win_console_handler.py"), tagname],
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
# Let the interpreter startup before we send signals. See #3137.
count, max = 0, 100
while count < max and proc.poll() is None:
if m[0] == 1:
break
time.sleep(0.1)
count += 1
else:
# Forcefully kill the process if we weren't able to signal it.
os.kill(proc.pid, signal.SIGINT)
self.fail("Subprocess didn't finish initialization")
os.kill(proc.pid, event)
# proc.send_signal(event) could also be done here.
# Allow time for the signal to be passed and the process to exit.
time.sleep(0.5)
if not proc.poll():
# Forcefully kill the process if we weren't able to signal it.
os.kill(proc.pid, signal.SIGINT)
self.fail("subprocess did not stop on {}".format(name))
script = os.path.join(os.path.dirname(__file__),
"win_console_handler.py")
cmd = [sys.executable, script, tagname]
proc = subprocess.Popen(cmd,
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)

with proc:
# Let the interpreter startup before we send signals. See #3137.
for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
if proc.poll() is None:
break
else:
# Forcefully kill the process if we weren't able to signal it.
proc.kill()
self.fail("Subprocess didn't finish initialization")

os.kill(proc.pid, event)

try:
# proc.send_signal(event) could also be done here.
# Allow time for the signal to be passed and the process to exit.
proc.wait(timeout=support.SHORT_TIMEOUT)
except subprocess.TimeoutExpired:
# Forcefully kill the process if we weren't able to signal it.
proc.kill()
self.fail("subprocess did not stop on {}".format(name))

@unittest.skip("subprocesses aren't inheriting Ctrl+C property")
@support.requires_subprocess()
Expand Down