From 049ca2d54f7b4fe8577f09d811bc46c1dffa1344 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 24 Jan 2024 21:52:28 -0300 Subject: [PATCH] fix(examples): deadlock on api example unit test (#8671) --- core/tauri/src/test/mock_runtime.rs | 2 +- examples/api/src-tauri/src/lib.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/tauri/src/test/mock_runtime.rs b/core/tauri/src/test/mock_runtime.rs index 8e5d77234..a663cc44a 100644 --- a/core/tauri/src/test/mock_runtime.rs +++ b/core/tauri/src/test/mock_runtime.rs @@ -856,7 +856,7 @@ pub struct MockRuntime { impl MockRuntime { fn init() -> Self { let is_running = Arc::new(AtomicBool::new(false)); - let (tx, rx) = sync_channel(1); + let (tx, rx) = sync_channel(256); let context = RuntimeContext { is_running: is_running.clone(), windows: Default::default(), diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs index cfada85e6..e6153b465 100644 --- a/examples/api/src-tauri/src/lib.rs +++ b/examples/api/src-tauri/src/lib.rs @@ -41,7 +41,7 @@ pub fn run_app) + Send + 'static>( let mut builder = builder .plugin(tauri_plugin_sample::init()) .setup(move |app| { - #[cfg(desktop)] + #[cfg(all(desktop, not(test)))] { let handle = app.handle(); tray::create_tray(handle)?; @@ -51,7 +51,7 @@ pub fn run_app) + Send + 'static>( #[cfg(target_os = "macos")] app.manage(AppMenu::(Default::default())); - #[cfg(desktop)] + #[cfg(all(desktop, not(test)))] app.manage(PopupMenu( tauri::menu::MenuBuilder::new(app) .check("check", "Tauri is awesome!") @@ -61,7 +61,8 @@ pub fn run_app) + Send + 'static>( )); let mut window_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default()); - #[cfg(desktop)] + + #[cfg(all(desktop, not(test)))] { window_builder = window_builder .title("Tauri API Validation")