diff --git a/quest/m1/test-flakes-2/README.md b/quest/m1/test-flakes-2/README.md index a6ae9e970c3..42b956af552 100644 --- a/quest/m1/test-flakes-2/README.md +++ b/quest/m1/test-flakes-2/README.md @@ -42,8 +42,6 @@ Public API: none. Wire: none. - [gst redial port](/quest/m1/test-flakes-2/gst-redial-port.md) - the moq-gst redial tests never lose their relay's port to `AddrInUse` - [js/net local close](/quest/m1/test-flakes-2/js-local-close.md) - the draft-17 locally closed track test holds under load - [WASM refused track](/quest/m1/test-flakes-2/wasm-refused-track.md) - the refused-track case passes and fails on its refusal, not a timeout -- [Drill shaper failure](/quest/m1/test-flakes-2/drill-shaper-failure.md) - a drill whose shaper stopped says so directly - ## Related - [Controlled time](/quest/m1/time/README.md) - the systemic fix these rules ask for: every crate on a controlled clock diff --git a/quest/m1/test-flakes-2/drill-shaper-failure.md b/quest/m1/test-flakes-2/drill-shaper-failure.md deleted file mode 100644 index aa8f8ebf233..00000000000 --- a/quest/m1/test-flakes-2/drill-shaper-failure.md +++ /dev/null @@ -1,18 +0,0 @@ -# [XS] A drill names a shaper that stopped - -## Goal - -When a relay drill's shaper stops forwarding, the failure says so directly -instead of surfacing later as a status timeout. - -## Plan - -`Drop for Path` in `rs/moq-relay/tests/drills.rs` prints only the shaper's -counters; only `verify()` reports the shaper's error. Surface that error -when a drill fails. Found while chasing #5796. - -Public API: none. Wire: none. - -## Related - -- [Relay burst drill](/quest/m1/test-flakes-2/relay-burst-impaired.md) - another impaired drill failure diff --git a/rs/moq-relay/tests/drills.rs b/rs/moq-relay/tests/drills.rs index 84a3b118a04..9e86395177c 100644 --- a/rs/moq-relay/tests/drills.rs +++ b/rs/moq-relay/tests/drills.rs @@ -187,9 +187,14 @@ fn seed(lane: Lane) -> u64 { impl Drop for Path { fn drop(&mut self) { - // A drill that failed before `verify` still reports what the path did. + // A drill that failed before `verify` still reports what the path did, + // including a shaper that stopped forwarding, which the drill itself + // only sees as a client timing out. if let Some(shaper) = &self.shaper { - println!("shaper: {}", shaper.stats()); + match shaper.verify() { + Ok(stats) => println!("shaper: {stats}"), + Err(err) => println!("shaper: {err:#}"), + } } } }