From a58494483a2c618636697e05f9c799b03e405056 Mon Sep 17 00:00:00 2001 From: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:48:35 -0700 Subject: chore: Disable part of parallel serve test on macos (flaky) (#25057) MacOS tends to not distribute evenly, so just don't assert that requests were served by > 1 worker on mac. Also added a check that all workers start, so we at least check that on macos. --- tests/integration/serve_tests.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/integration') diff --git a/tests/integration/serve_tests.rs b/tests/integration/serve_tests.rs index f3d887ec2..c34b0e286 100644 --- a/tests/integration/serve_tests.rs +++ b/tests/integration/serve_tests.rs @@ -229,6 +229,19 @@ async fn deno_serve_parallel() { "4" ); + // make sure all workers have at least started + let mut started = [false; 4]; + let start_regex = + Regex::new(r"\[serve\-worker\-(\d+)\s*\] starting serve").unwrap(); + for capture in start_regex.captures_iter(&output) { + if let Some(worker_number) = + capture.get(1).and_then(|m| m.as_str().parse::().ok()) + { + started[worker_number as usize] = true; + } + } + assert!(started.iter().all(|&b| b)); + for capture in serve_regex.captures_iter(&output) { if let Some(worker_number) = capture.get(1).and_then(|m| m.as_str().parse::().ok()) @@ -237,6 +250,7 @@ async fn deno_serve_parallel() { } } + #[cfg(not(target_vendor = "apple"))] // FIXME: flaky on macOS, it tends to not distribute requests evenly assert!( serve_counts.values().filter(|&&n| n > 2).count() >= 2, "bad {serve_counts:?}" -- cgit v1.2.3