linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(http/retry): port some `ReplayBody` tests to `Frame<T>` (#3564) 

see linkerd/linkerd2#8733.

pr #3559 introduced some compatibility facilities to allow us to write
code in terms of `http_body_util::BodyExt::frame()`, front-running the
upgrade to be performed in #3504.

some `ReplayBody` tests use the defunct `data()` and `trailers()`
interfaces. this branch ports _two_ such unit tests. other tests are
saved for a fast follow-on, as the `chunk(..)` and `read_to_string(..)`
helpers will need some slightly more involved tweaks.

dd4fbcdb6e

---

* refactor(http/retry): `replays_trailers()` uses `Frame<T>`

see https://github.com/linkerd/linkerd2/issues/8733.

this commit upgrades a test that uses defunct `data()` and `trailers()`
futures.

Signed-off-by: katelyn martin <kate@buoyant.io>

* refactor(http/retry): `trailers_only()` uses `Frame<T>`

see https://github.com/linkerd/linkerd2/issues/8733.

this commit upgrades a test that uses defunct `data()` and `trailers()`
futures.

Signed-off-by: katelyn martin <kate@buoyant.io>

---------

Signed-off-by: katelyn martin <kate@buoyant.io>
This commit is contained in:
katelyn martin 2025-01-27 15:43:58 -05:00 committed by GitHub
parent 0484917159
commit 1eb822f2e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
linkerd/http/retry/src/replay.rs
View File

@ -547,8 +547,8 @@ mod tests {
async fn replays_trailers() {
let Test {
mut tx,
mut initial,
mut replay,
initial,
replay,
_trace,
} = Test::new();
@ -560,30 +560,43 @@ mod tests {
tx.send_trailers(tlrs.clone()).await;
drop(tx);
while initial.data().await.is_some() {
// do nothing
}
let initial_tlrs = initial.trailers().await.expect("trailers should not error");
assert_eq!(initial_tlrs.as_ref(), Some(&tlrs));
let read_trailers = |body: ReplayBody<_>| async move {
let mut body = crate::compat::ForwardCompatibleBody::new(body);
let _ = body
.frame()
.await
.expect("should yield a result")
.expect("should yield a frame")
.into_data()
.expect("should yield data");
let trls = body
.frame()
.await
.expect("should yield a result")
.expect("should yield a frame")
.into_trailers()
.expect("should yield trailers");
assert!(body.frame().await.is_none());
trls
};
// drop the initial body to send the data to the replay
drop(initial);
let initial_tlrs = read_trailers(initial).await;
assert_eq!(&initial_tlrs, &tlrs);
while replay.data().await.is_some() {
// do nothing
}
let replay_tlrs = replay.trailers().await.expect("trailers should not error");
assert_eq!(replay_tlrs.as_ref(), Some(&tlrs));
let replay_tlrs = read_trailers(replay).await;
assert_eq!(&replay_tlrs, &tlrs);
}
#[tokio::test]
async fn trailers_only() {
let Test {
mut tx,
mut initial,
mut replay,
initial,
replay,
_trace,
} = Test::new();
let mut initial = crate::compat::ForwardCompatibleBody::new(initial);
let mut replay = crate::compat::ForwardCompatibleBody::new(replay);
let mut tlrs = HeaderMap::new();
tlrs.insert("x-hello", HeaderValue::from_str("world").unwrap());
@ -593,16 +606,26 @@ mod tests {
drop(tx);
assert!(dbg!(initial.data().await).is_none(), "no data in body");
let initial_tlrs = initial.trailers().await.expect("trailers should not error");
assert_eq!(initial_tlrs.as_ref(), Some(&tlrs));
let initial_tlrs = initial
.frame()
.await
.expect("should yield a result")
.expect("should yield a frame")
.into_trailers()
.expect("should yield trailers");
assert_eq!(&initial_tlrs, &tlrs);
// drop the initial body to send the data to the replay
drop(initial);
assert!(dbg!(replay.data().await).is_none(), "no data in body");
let replay_tlrs = replay.trailers().await.expect("trailers should not error");
assert_eq!(replay_tlrs.as_ref(), Some(&tlrs));
let replay_tlrs = replay
.frame()
.await
.expect("should yield a result")
.expect("should yield a frame")
.into_trailers()
.expect("should yield trailers");
assert_eq!(&replay_tlrs, &tlrs);
}
#[tokio::test(flavor = "current_thread")]