diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac5034dda..2a3e0e1e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -193,6 +193,11 @@ jobs: # to the schema alone is checked against them too. - name: Validate the fixture projects against the schema run: pipx run check-jsonschema==0.39.0 --schemafile schema/project.schema.json --default-filetype json schema/fixtures/*.rgis + # Timer waits and ignored tests carry their reasons. xtask's own test checks this too, but + # `test` runs only the packages a pull request changes, so a new wait elsewhere got past it + # and failed main (#2289). This runs on the whole workspace every time. + - name: Test hygiene + run: cargo run --locked -q -p xtask -- test-hygiene # The packages whose tests this run needs, for `test` (.github/scripts/test-selection.sh). Only # tests are narrowed: lint, the wasm build, licences and the schema check run whole every time. diff --git a/crates/geolibre/src/langpack.rs b/crates/geolibre/src/langpack.rs index 4951ba850..d255104c4 100644 --- a/crates/geolibre/src/langpack.rs +++ b/crates/geolibre/src/langpack.rs @@ -732,7 +732,7 @@ mod tests { // record an error for a pack already gone. let check = LIFECYCLE.lock().unwrap(); let removal = std::thread::spawn(|| remove("fr")); - std::thread::sleep(std::time::Duration::from_millis(200)); + std::thread::sleep(std::time::Duration::from_millis(200)); // test-wait: proves remove() stays blocked while a check holds LIFECYCLE; no signal marks a blocked call assert!(!removal.is_finished(), "remove ran during a check"); drop(check); removal.join().unwrap().unwrap();