Skip to content

refactor(http/retry): update more Body::data() calls #3573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cratelyn merged 1 commit into from
Jan 30, 2025
Merged

refactor(http/retry): update more Body::data() calls #3573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions linkerd/http/retry/src/replay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ mod tests {
// alternately, hyperium/http-body#140 adds a channel-backed body to `http-body-util`.
let (mut tx, body) = hyper::Body::channel();
let mut initial = ReplayBody::try_new(body, 8).expect("channel body must not be too large");
let mut replay = initial.clone();
let replay = initial.clone();

// Send enough data to reach the cap
tx.send_data(Bytes::from("aaaaaaaa")).await.unwrap();
Expand All @@ -884,11 +884,12 @@ mod tests {

// The request's replay should error, since we discarded the buffer when
// we hit the cap.
let mut replay = crate::compat::ForwardCompatibleBody::new(replay);
let err = replay
.data()
.frame()
.await
.expect("replay must yield Some(Err(..)) when capped")
.expect_err("replay must error when cappped");
.expect("yields a result")
.expect_err("yields an error when capped");
assert!(err.is::<Capped>())
}

Expand All @@ -910,7 +911,7 @@ mod tests {
assert_eq!(chunk(&mut initial).await, Some("aaaaaaaa".to_string()));
drop(initial);

let mut replay2 = replay.clone();
let replay2 = replay.clone();

// The replay will reach the cap, but it should still return data from
// the original body.
Expand All @@ -920,11 +921,12 @@ mod tests {
drop(replay);

// The second replay will fail, though, because the buffer was discarded.
let mut replay2 = crate::compat::ForwardCompatibleBody::new(replay2);
let err = replay2
.data()
.frame()
.await
.expect("replay must yield Some(Err(..)) when capped")
.expect_err("replay must error when cappped");
.expect("yields a result")
.expect_err("yields an error when capped");
assert!(err.is::<Capped>())
}

Expand Down