diff --git a/quest/m1/test-flakes-2/README.md b/quest/m1/test-flakes-2/README.md index 345570e472c..6e338309e9c 100644 --- a/quest/m1/test-flakes-2/README.md +++ b/quest/m1/test-flakes-2/README.md @@ -38,7 +38,6 @@ Public API: none. Wire: none. - [Scoped WARN capture](/quest/m1/test-flakes-2/warn-capture.md) - the drop-unfinished tests count only their own WARNs - [moq-mux debounce clock](/quest/m1/test-flakes-2/mux-debounce-clock.md) - the TS export debounce test advances on the paused clock - [js/publish audio clock](/quest/m1/test-flakes-2/publish-audio-clock.md) - the audio encoder delay test runs on mock time -- [WebSocket paused TLS dial](/quest/m1/test-flakes-2/websocket-paused-tls.md) - the fixed-address WebSocket tests stop pausing the clock over a real dial - [Rejoin after idle](/quest/m1/test-flakes-2/rejoin-idle-race.md) - an IETF rejoin never gets the stale warm cache first, because the copy goes idle before the cancel ## Related diff --git a/quest/m1/test-flakes-2/websocket-paused-tls.md b/quest/m1/test-flakes-2/websocket-paused-tls.md deleted file mode 100644 index d92b724882a..00000000000 --- a/quest/m1/test-flakes-2/websocket-paused-tls.md +++ /dev/null @@ -1,14 +0,0 @@ -# [XS] WebSocket fixed-address tests off the paused clock - -## Goal - -moq-tokio websocket `fixed_addresses_keep_tls_name_and_request_host` and -`ipv6_literal_fixed_addresses` no longer pause the clock over a real TLS -dial. - -## Plan - -They pass today, but they pause the clock over a real TLS dial on loopback. -Once a timeout lands on that path, the paused clock can fire it before -loopback delivers, the race [#4527](https://github.com/moq-dev/moq/pull/4527) -removed from the auth outage tests. Remove it the same way. diff --git a/rs/moq-tokio/src/websocket.rs b/rs/moq-tokio/src/websocket.rs index e48d13c9619..950b6289e50 100644 --- a/rs/moq-tokio/src/websocket.rs +++ b/rs/moq-tokio/src/websocket.rs @@ -719,7 +719,6 @@ mod tests { #[tokio::test] async fn fixed_addresses_keep_tls_name_and_request_host() { - tokio::time::pause(); check_tls_authority("relay.example", true, None).await; } @@ -730,7 +729,6 @@ mod tests { #[tokio::test] async fn ipv6_literal_fixed_addresses() { - tokio::time::pause(); check_tls_authority("[::1]", true, None).await; } @@ -741,6 +739,9 @@ mod tests { /// Dial `wss://{url_host}` on loopback, optionally pinned to fixed addresses, and /// check the TLS name and HTTP `Host` the server sees. + /// + /// Stays on the wall clock. A paused clock auto-advances while the real dial + /// waits, so a timer on this path can fire before loopback delivers. async fn check_tls_authority(url_host: &str, fixed: bool, tls_name: Option<&str>) { let ipv6 = url_host.starts_with('['); let name = tls_name.unwrap_or(url_host.trim_start_matches('[').trim_end_matches(']'));