From 274ae84c011d464f124d55de67b7d4739611cc9b Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Thu, 24 Sep 2026 12:56:53 +0800 Subject: [PATCH] test(app): keep the language -> config lock order in the update test The other app test modules nest the process-wide locks language then config; taking them the other way round could deadlock two tests running in parallel. --- crates/oak-app/src/app.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/oak-app/src/app.rs b/crates/oak-app/src/app.rs index beb25b7a5..6b3d0c7b2 100644 --- a/crates/oak-app/src/app.rs +++ b/crates/oak-app/src/app.rs @@ -8874,10 +8874,11 @@ mod tests { async fn update_check_prompts_and_respects_the_preferences(cx: &mut TestAppContext) { use std::sync::atomic::{AtomicU32, Ordering}; - let _guard = crate::oakui::graphops::test_lock(); + // Lock order: language -> config (see the preferences tests). let _lang = crate::i18n::lang_test_lock() .lock() .unwrap_or_else(|e| e.into_inner()); + let _guard = crate::oakui::graphops::test_lock(); crate::i18n::set_language_code("en-US"); let (_window, root) = mock_shell(cx);