Skip to content

Commit 1cb79c8

Browse files
committed
fix(desktop): gate macos resume tests by target
1 parent fc8ac88 commit 1cb79c8

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

desktop/src-tauri/src/main.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,12 +2082,11 @@ mod tests {
20822082
should_retry_sidecar_request, should_trigger_resume_recovery, shutdown_sidecar_with_reason,
20832083
sidecar_candidate_paths, sidecar_creation_flags, sidecar_request_with_recovery,
20842084
sidecar_request_with_recovery_hooks, sidecar_resource_name, spawn_sidecar,
2085-
tray_icon_bytes_for_platform, tray_icon_is_template_for_platform,
2086-
try_acquire_resume_recovery_slot, update_download_progress, wait_for_backend_ready,
2087-
wait_for_backend_ready_with_probe, window_close_action, AppSettingsPayload,
2088-
DesktopLogEntry, DesktopRuntime, DesktopSettingsCache, HttpResponse, UpdateInfoPayload,
2089-
UpdateManagerState, UpdateProgressPayload, UpdateStatePayload, UpdateStatus,
2090-
WindowCloseAction, WindowSizeCache, DESKTOP_RUNTIME, MAIN_WINDOW_MIN_HEIGHT,
2085+
tray_icon_bytes_for_platform, tray_icon_is_template_for_platform, update_download_progress,
2086+
wait_for_backend_ready, wait_for_backend_ready_with_probe, window_close_action,
2087+
AppSettingsPayload, DesktopLogEntry, DesktopRuntime, DesktopSettingsCache, HttpResponse,
2088+
UpdateInfoPayload, UpdateManagerState, UpdateProgressPayload, UpdateStatePayload,
2089+
UpdateStatus, WindowCloseAction, WindowSizeCache, DESKTOP_RUNTIME, MAIN_WINDOW_MIN_HEIGHT,
20912090
MAIN_WINDOW_MIN_WIDTH, SIDECAR_CHILD, SIDECAR_MACOS_NAME, SIDECAR_WINDOWS_NAME,
20922091
TRAY_ICON_COLOR_BYTES, TRAY_ICON_TEMPLATE_BYTES, UPDATE_MANAGER,
20932092
};
@@ -2097,11 +2096,16 @@ mod tests {
20972096
use std::net::TcpListener;
20982097
use std::path::{Path, PathBuf};
20992098
use std::process::Command;
2100-
use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
2099+
use std::sync::atomic::Ordering;
21012100
use std::sync::Arc;
21022101
use std::time::Duration;
21032102
use std::time::{SystemTime, UNIX_EPOCH};
21042103

2104+
#[cfg(target_os = "macos")]
2105+
use super::try_acquire_resume_recovery_slot;
2106+
#[cfg(target_os = "macos")]
2107+
use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize};
2108+
21052109
#[test]
21062110
fn parse_account_menu_id_accepts_valid_ids() {
21072111
assert_eq!(parse_account_menu_id("account-select:7"), Some(7));
@@ -2773,6 +2777,7 @@ mod tests {
27732777
));
27742778
}
27752779

2780+
#[cfg(target_os = "macos")]
27762781
#[test]
27772782
fn resume_recovery_slot_coalesces_overlapping_runs() {
27782783
let running = AtomicBool::new(false);
@@ -2807,6 +2812,7 @@ mod tests {
28072812
assert!(!running.load(Ordering::SeqCst));
28082813
}
28092814

2815+
#[cfg(target_os = "macos")]
28102816
#[test]
28112817
fn resume_recovery_slot_skips_recent_duplicate_triggers() {
28122818
let running = AtomicBool::new(false);
@@ -2826,6 +2832,7 @@ mod tests {
28262832
);
28272833
}
28282834

2835+
#[cfg(target_os = "macos")]
28292836
#[test]
28302837
#[ignore = "local smoke test that stresses duplicate resume recovery triggers"]
28312838
fn resume_recovery_slot_stays_single_flight_under_burst_triggers() {

0 commit comments

Comments
 (0)