shifathosn
/
pdfcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Picker tests wait for the worker instead of polling with a deadline (#221) 

a_panicking_worker_clears_showing_and_queues_nothing failed on main (Linux CI and
Windows ARM64): panic unwinding on a loaded runner can take longer than the
1 s polling window. Tests now join the worker thread, so they can't time out.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Brandon Thomas 2026-10-08 02:33:11 -04:00 committed by GitHub
parent 42078a8365
commit 827c61bba9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
crates/ui-egui/src/pickers.rs
View File

@ -59,20 +59,30 @@ impl Pickers {
/// already have shown the picker (rfd starts the panel when the future is created, on the
/// main thread). Returns false when the worker couldn't start.
fn spawn<F>(&self, pick_for: PickFor, target: Option<DocId>, ctx: Option<egui::Context>, pick: F) -> bool
where
F: Future<Output = Vec<PathBuf>> + Send + 'static,
{
self.spawn_worker(pick_for, target, ctx, pick).is_some()
}
/// [`Self::spawn`], returning the worker so tests can wait for it instead of polling.
fn spawn_worker<F>(&self, pick_for: PickFor, target: Option<DocId>, ctx: Option<egui::Context>, pick: F) -> Option<std::thread::JoinHandle<()>>
where
F: Future<Output = Vec<PathBuf>> + Send + 'static,
{
let showing = Showing(self.showing.clone());
let done = self.done.clone();
let started = std::thread::Builder::new().name("file-picker".into()).spawn(move || {
let _showing = showing;
let paths = pollster::block_on(pick);
done.lock().unwrap_or_else(PoisonError::into_inner).push(Picked { pick_for, target, paths });
if let Some(ctx) = ctx {
ctx.request_repaint();
}
});
started.is_ok()
std::thread::Builder::new()
.name("file-picker".into())
.spawn(move || {
let _showing = showing;
let paths = pollster::block_on(pick);
done.lock().unwrap_or_else(PoisonError::into_inner).push(Picked { pick_for, target, paths });
if let Some(ctx) = ctx {
ctx.request_repaint();
}
})
.ok()
}
/// Queue a pick that is already known (tests and automation).
@ -144,13 +154,9 @@ mod tests {
fn worker_queues_the_pick_and_clears_showing() {
let pickers = Pickers::default();
pickers.showing.store(true, Ordering::SeqCst);
assert!(pickers.spawn(PickFor::Open, None, None, async { vec![PathBuf::from("a.pdf")] }));
for _ in 0..500 {
if !pickers.showing.load(Ordering::SeqCst) {
break;
}
std::thread::sleep(std::time::Duration::from_millis(2));
}
let worker = pickers.spawn_worker(PickFor::Open, None, None, async { vec![PathBuf::from("a.pdf")] }).expect("worker starts");
// Wait for the worker itself: polling with a deadline was flaky on loaded CI runners.
assert!(worker.join().is_ok());
assert!(!pickers.showing.load(Ordering::SeqCst));
let picked = pickers.take();
assert_eq!(picked.len(), 1);
@ -164,13 +170,9 @@ mod tests {
fn fail() -> Vec<PathBuf> {
panic!("picker failed")
}
assert!(pickers.spawn(PickFor::Open, None, None, async { fail() }));
for _ in 0..500 {
if !pickers.showing.load(Ordering::SeqCst) {
break;
}
std::thread::sleep(std::time::Duration::from_millis(2));
}
let worker = pickers.spawn_worker(PickFor::Open, None, None, async { fail() }).expect("worker starts");
// join returns once the panic has unwound and the drop guard has run.
assert!(worker.join().is_err());
assert!(!pickers.showing.load(Ordering::SeqCst));
assert!(pickers.take().is_empty());
}