diff --git a/quest/m0/test-flakes-2/README.md b/quest/m0/test-flakes-2/README.md index 9b43b806b13..f919a5fd290 100644 --- a/quest/m0/test-flakes-2/README.md +++ b/quest/m0/test-flakes-2/README.md @@ -272,10 +272,4 @@ session as publishing outside its grant once in [moq-dev/moq#8444](https://github.com/moq-dev/moq/pull/8444)'s local run and passed on rerun. It is quarantined until its child fixes it. -Added 2026-11-12 (maintainer's standing rule that flakes join this epic): -moq-ffi's `raw_audio_decode_delay`, whose decoded read hung until the host-clock -timeout aborted it in the merge queue for -[moq-dev/moq#8525](https://github.com/moq-dev/moq/pull/8525). It is quarantined -with `#[ignore]` until its child fixes it. - Public API: none. Wire: none. diff --git a/quest/m0/test-flakes-2/ffi-raw-audio-decode-delay.md b/quest/m0/test-flakes-2/ffi-raw-audio-decode-delay.md deleted file mode 100644 index de07fc1411e..00000000000 --- a/quest/m0/test-flakes-2/ffi-raw-audio-decode-delay.md +++ /dev/null @@ -1,40 +0,0 @@ -# [S] moq-ffi's raw audio decode delay test holds up - -## Goal - -`moq-ffi`'s `test::raw_audio_decode_delay` (feature `audio`) passes reliably, -fixed at its cause, and its `#[ignore]` is removed. - -## Plan - -Seen 2026-11-12 in the merge queue for -[moq-dev/moq#8525](https://github.com/moq-dev/moq/pull/8525), which does not -touch moq-ffi: [run 43198904021](https://github.com/moq-dev/moq/actions/runs/43198904021) -(job 131116860271, log lines about 6476 to 6600 of `gh run view 43198904021 --log-failed`) -aborted with SIGABRT. The previous queue run, -[43198314575](https://github.com/moq-dev/moq/actions/runs/43198314575), passed it. -A read's `JoinHandle`, awaited in the test's read loop, never returned until -the 10 s `kio::clock::timeout(TIMEOUT, ...)` fired on the host clock, which -`KIO_DENY_HOST_TIMERS=1` turns into an abort. A decoded read hanging is more -than a tight budget, so suspect a real race in the FFI audio consumer. - -Hypothesis from a quick read, unconfirmed: the fixed-delay consumer asks for -`max: Some(Duration::ZERO)`. [moq-dev/moq#8050](https://github.com/moq-dev/moq/pull/8050) -found that a zero max delay makes a read that runs late under load find the -first group stale and the warmup trim all remaining audio. This test writes -only two frames and never finishes before reading, so a trimmed read would -wait forever instead of returning a frame or an end. If that is the cause, -decide whether the test should ask for no max delay, as #8050's fixed -consumer does, or whether the consumer should hold the newest frame instead of -trimming everything, rather than only loosening the delay it asks for. - -Steps: - -- Reproduce under load first (for example, many parallel runs of the test - under `quest gate`, or delaying the reads past the 80 ms warmup). -- Run the test on a mocked clock, such as `start_paused` or `kio::clock::Manual`, - as [moq-dev/moq#8329](https://github.com/moq-dev/moq/pull/8329) did for the - warmup test, so the FFI runtime's real clock cannot skew it. -- Fix the root cause, then remove the `#[ignore]`. - -Public API: none expected. Wire: none. diff --git a/rs/moq-ffi/src/test.rs b/rs/moq-ffi/src/test.rs index 547e9d4e96c..635a87e3512 100644 --- a/rs/moq-ffi/src/test.rs +++ b/rs/moq-ffi/src/test.rs @@ -848,7 +848,6 @@ async fn audio_raw_publish_rejects_bad_frames() { /// the decoder sits behind the read's lock, so the getter must not need it. #[cfg(feature = "audio")] #[tokio::test] -#[ignore = "flaky: a decoded read sometimes never returns; quest/m0/test-flakes-2/ffi-raw-audio-decode-delay.md"] async fn raw_audio_decode_delay() { use crate::audio::*; @@ -893,10 +892,9 @@ async fn raw_audio_decode_delay() { "microphone".into(), rendition.clone(), MoqAudioDecoderOutput { - delay: delay.map(|min| MoqDelay { - min: Some(min), - max: Some(Duration::ZERO), - }), + // No max delay: at zero, a read that runs late under load finds group 0 + // stale and the mid-join warmup trims the rest, so the read never returns. + delay: Some(MoqDelay { min: delay, max: None }), estimate: delay.is_none(), ..audio_output() }, diff --git a/sh/gh/test-inventory.allow b/sh/gh/test-inventory.allow index eded70c95e8..e0a216e30c2 100644 --- a/sh/gh/test-inventory.allow +++ b/sh/gh/test-inventory.allow @@ -34,6 +34,3 @@ ignore moq-video::frame::tests::d3d11_resize_defaults_to_the_gpu /quest/m5/video ignore moq-video::frame::tests::d3d11_resize_matches_cpu /quest/m5/video-hardware.md ignore moq-video::render::export::dx12::tests::exports_an_nv12_texture /quest/m5/video-hardware.md ignore moq-video::render::export::dx12::tests::media_foundation_encodes_the_export_in_place /quest/m5/video-hardware.md - -# Flaked under load; disabled until fixed at its cause. -ignore moq-ffi::test::raw_audio_decode_delay /quest/m0/test-flakes-2/ffi-raw-audio-decode-delay.md