Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ format = [
lint = [
"mypy (>=1.20.1,<2.0.0)",
"types-pynput (>=1.8.1.20260408,<2.0.0.0)",
"types-psutil (>=7.2.2.20260408,<8.0.0.0)"
"types-psutil (>=7.2.2.20260408,<8.0.0.0)",
"types-pywin32 (>=312.0.0.20260609,<313.0.0.0)"
]


Expand Down
4 changes: 3 additions & 1 deletion src/visiongui/driver/close.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import logging

import psutil
import win32process

from visiongui.driver.DesktopDriverInterface import (
DesktopDriverInterface,
Expand All @@ -19,7 +20,8 @@ def close(
window = driver.window
pid = None
if window is not None:
pid = window.getPID()
# Obtain the process ID directly from the window handle via the Win32 API. In some cases, window.getPID() returned invalid process IDs (e.g. negative or nonexistent values), causing psutil.Process(pid) to fail even though the window was still present. GetWindowThreadProcessId() reliably returns the process that owns the window.
_, pid = win32process.GetWindowThreadProcessId(window._hWnd)

logger.debug(f"Forcefully killing process owning the window: {pid}")
proc = psutil.Process(pid)
Expand Down
26 changes: 26 additions & 0 deletions tests/driver/test_close.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,29 @@ def test_forced_process_termination(self, stubborn_app_path: Path) -> None:

assert self.desktop_driver.process is None
assert self.desktop_driver.window is None

def test_close_uses_window_handle_pid_instead_of_window_getPID(
self,
dummy_app_path: Path,
monkeypatch: pytest.MonkeyPatch,
) -> None:
self.desktop_driver.launch_process(cmd=["python", str(dummy_app_path)])

self.desktop_driver.window = self.desktop_driver.find_window(
title=re.compile(f"^{re.escape(self.test_case_name)}$"),
timeout=5,
)

assert self.desktop_driver.process is not None
assert self.desktop_driver.window is not None

monkeypatch.setattr(
self.desktop_driver.window,
"getPID",
lambda: -1103552400,
)

self.desktop_driver.close(OS_PROCESS_KILL_TIMEOUT=OS_PROCESS_KILL_TIMEOUT)

assert self.desktop_driver.process is None
assert self.desktop_driver.window is None