Skip to content

mcp(test): cancel and join click workers on unwind so a panic cannot leak the browser #216

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
suchintan merged 1 commit into from
Aug 5, 2026
Merged

mcp(test): cancel and join click workers on unwind so a panic cannot leak the browser #216

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
59 changes: 45 additions & 14 deletions mcp/src/actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4364,6 +4364,29 @@ mod tests {
use super::*;
use rustwright::ActionabilityError;

struct WorkerGuard<T> {
cancel: CancelToken,
worker: Option<thread::JoinHandle<T>>,
}

impl<T> WorkerGuard<T> {
fn join(mut self) -> thread::Result<T> {
self.worker
.take()
.expect("worker handle must be present")
.join()
}
}

impl<T> Drop for WorkerGuard<T> {
fn drop(&mut self) {
if let Some(worker) = self.worker.take() {
self.cancel.cancel();
let _ = worker.join();
}
}
}

struct HangingServer {
addr: SocketAddr,
stop: Arc<std::sync::atomic::AtomicBool>,
Expand Down Expand Up @@ -7596,13 +7619,17 @@ mod tests {
let cancel = CancelToken::new();
let click_cancel = cancel.clone();
let click_page = page.clone();
let click = thread::spawn(move || {
click_page.click_with_cancel(
"#cancel",
ActionOptions::timeout(10_000.0),
Some(&click_cancel),
)
});
// Declared after `browser` so unwind cancels and joins the worker before browser cleanup.
let click = WorkerGuard {
cancel: cancel.clone(),
worker: Some(thread::spawn(move || {
click_page.click_with_cancel(
"#cancel",
ActionOptions::timeout(10_000.0),
Some(&click_cancel),
)
})),
};
assert_eq!(server.capture(), "actionability-started");
cancel.cancel();
assert!(matches!(
Expand Down Expand Up @@ -7639,13 +7666,17 @@ mod tests {
let cancel = CancelToken::new();
let click_cancel = cancel.clone();
let click_page = page.clone();
let click = thread::spawn(move || {
click_page.click_with_cancel(
"#atomic",
ActionOptions::timeout(5_000.0),
Some(&click_cancel),
)
});
// Declared after `browser` so unwind cancels and joins the worker before browser cleanup.
let click = WorkerGuard {
cancel: cancel.clone(),
worker: Some(thread::spawn(move || {
click_page.click_with_cancel(
"#atomic",
ActionOptions::timeout(5_000.0),
Some(&click_cancel),
)
})),
};
assert_eq!(server.capture(), "atomic-mousedown");
cancel.cancel();
click
Expand Down
Loading