Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quest/m0/test-flakes-2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,3 @@ Public API: none. Wire: none.
- [The embedded relay's sockets are closed when run returns](/quest/m0/test-flakes-2/embed-sockets-outlived.md) - `embed::worker_tokio_custom_route_and_quic` stops failing with "the owner's sockets outlived `run`"
- [The http:// fingerprint tests survive a slow fetch](/quest/m0/test-flakes-2/fingerprint-host-clock.md) - a fingerprint fetch slower than the 500 ms hedge no longer trips the host-clock guard
- [A lite-07 reply FINs instead of resetting when the subscriber FINs mid-write](/quest/m0/test-flakes-2/lite07-reply-fin.md) - `js/net`'s empty-window reply test passes under `--rerun-each 200`, fixed in the publisher
- [moq-tokio's stream-stopped tests survive a loaded host](/quest/m0/test-flakes-2/quic-stream-stopped.md) - `stream_stopped` awaits its stop event instead of a 100 ms wall-clock deadline, and its `#[ignore]` is removed
25 changes: 0 additions & 25 deletions quest/m0/test-flakes-2/quic-stream-stopped.md

This file was deleted.

10 changes: 4 additions & 6 deletions rs/moq-tokio/src/quic/driver/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,6 @@ async fn multiple_conns_with_zero_length_cids() {
}

#[tokio::test]
#[ignore = "flaky: its 100ms wall-clock budget runs out under a loaded CI host"]
async fn stream_stopped() {
let _guard = subscribe();
let factory = EndpointFactory::new();
Expand Down Expand Up @@ -1680,7 +1679,7 @@ async fn stream_stopped() {
let stopped3 = stopped3.await;
assert_eq!(stopped3, Ok(Some(42u32.into())));
};
let client = timeout(Duration::from_millis(100), client).instrument(error_span!("client"));
let client = client.instrument(error_span!("client"));
let server = async move {
let conn = server.accept().await.unwrap().accept().unwrap().await.unwrap();
let mut stream = conn.accept_uni().await.unwrap();
Expand All @@ -1690,8 +1689,7 @@ async fn stream_stopped() {
conn
}
.instrument(error_span!("server"));
let (client, conn) = tokio::join!(client, server);
client.expect("timeout");
let ((), conn) = tokio::join!(client, server);
drop(conn);
}

Expand All @@ -1705,7 +1703,7 @@ async fn stream_stopped_2() {
})
.unwrap();
let send_stream = conn.open_uni(Default::default()).await.unwrap();
let stopped = timeout(Duration::from_millis(100), send_stream.closed()).instrument(error_span!("stopped"));
let stopped = send_stream.closed().instrument(error_span!("stopped"));
tokio::pin!(stopped);
// poll the future once so that the waker is registered.
tokio::select! {
Expand All @@ -1718,7 +1716,7 @@ async fn stream_stopped_2() {
drop(send_stream);
// make sure the stopped future still resolves
let res = stopped.await;
assert_eq!(res, Ok(Ok(None)));
assert_eq!(res, Ok(None));
}

/// A send stream dropped before `finish` is reset, so the peer can't mistake the truncated data
Expand Down
1 change: 0 additions & 1 deletion sh/gh/test-inventory.allow
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ ignore moq-relay::embed::worker_tokio_custom_route_and_quic /quest/m0/test-flake
ignore moq-net::test_interop::lite_tracks_interop /quest/m2/cluster-routing/routes/js.md

# Quarantined flakes, until the quest that owns the flake fixes it at its cause.
ignore moq-tokio::quic::driver::tests::stream_stopped /quest/m0/test-flakes-2/README.md
Loading