Skip to content

Commit f1a51da

Browse files
committed
tests(client): update test to use new conn::http2::builder::new
1 parent b4d93a3 commit f1a51da

File tree

3 files changed

+15
-25
lines changed

3 files changed

+15
-25
lines changed

tests/client.rs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,8 +1922,7 @@ mod conn {
19221922
});
19231923

19241924
let io = tcp_connect(&addr).await.expect("tcp connect");
1925-
let (mut client, conn) = conn::http2::Builder::new()
1926-
.executor(TokioExecutor)
1925+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
19271926
.handshake(io)
19281927
.await
19291928
.expect("http handshake");
@@ -1979,8 +1978,7 @@ mod conn {
19791978
});
19801979

19811980
let io = tcp_connect(&addr).await.expect("tcp connect");
1982-
let (_client, conn) = conn::http2::Builder::new()
1983-
.executor(TokioExecutor)
1981+
let (_client, conn) = conn::http2::Builder::new(TokioExecutor)
19841982
.timer(TokioTimer)
19851983
.keep_alive_interval(Duration::from_secs(1))
19861984
.keep_alive_timeout(Duration::from_secs(1))
@@ -2008,8 +2006,7 @@ mod conn {
20082006
});
20092007

20102008
let io = tcp_connect(&addr).await.expect("tcp connect");
2011-
let (mut client, conn) = conn::http2::Builder::new()
2012-
.executor(TokioExecutor)
2009+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
20132010
.timer(TokioTimer)
20142011
.keep_alive_interval(Duration::from_secs(1))
20152012
.keep_alive_timeout(Duration::from_secs(1))
@@ -2040,8 +2037,7 @@ mod conn {
20402037
});
20412038

20422039
let io = tcp_connect(&addr).await.expect("tcp connect");
2043-
let (mut client, conn) = conn::http2::Builder::new()
2044-
.executor(TokioExecutor)
2040+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
20452041
.timer(TokioTimer)
20462042
.keep_alive_interval(Duration::from_secs(1))
20472043
.keep_alive_timeout(Duration::from_secs(1))
@@ -2100,8 +2096,7 @@ mod conn {
21002096
});
21012097

21022098
let io = tcp_connect(&addr).await.expect("tcp connect");
2103-
let (mut client, conn) = conn::http2::Builder::new()
2104-
.executor(TokioExecutor)
2099+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
21052100
.timer(TokioTimer)
21062101
.keep_alive_interval(Duration::from_secs(1))
21072102
.keep_alive_timeout(Duration::from_secs(1))
@@ -2156,8 +2151,7 @@ mod conn {
21562151
});
21572152

21582153
let io = tcp_connect(&addr).await.expect("tcp connect");
2159-
let (mut client, conn) = conn::http2::Builder::new()
2160-
.executor(TokioExecutor)
2154+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
21612155
.handshake(io)
21622156
.await
21632157
.expect("http handshake");
@@ -2207,8 +2201,7 @@ mod conn {
22072201
});
22082202

22092203
let io = tcp_connect(&addr).await.expect("tcp connect");
2210-
let (mut client, conn) = conn::http2::Builder::new()
2211-
.executor(TokioExecutor)
2204+
let (mut client, conn) = conn::http2::Builder::new(TokioExecutor)
22122205
.handshake::<_, Empty<Bytes>>(io)
22132206
.await
22142207
.expect("http handshake");

tests/server.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,8 +2389,7 @@ async fn http2_keep_alive_with_responsive_client() {
23892389
});
23902390

23912391
let tcp = connect_async(addr).await;
2392-
let (mut client, conn) = hyper::client::conn::http2::Builder::new()
2393-
.executor(TokioExecutor)
2392+
let (mut client, conn) = hyper::client::conn::http2::Builder::new(TokioExecutor)
23942393
.handshake(tcp)
23952394
.await
23962395
.expect("http handshake");
@@ -3017,8 +3016,7 @@ impl TestClient {
30173016
.unwrap();
30183017

30193018
if self.http2_only {
3020-
let (mut sender, conn) = hyper::client::conn::http2::Builder::new()
3021-
.executor(TokioExecutor)
3019+
let (mut sender, conn) = hyper::client::conn::http2::Builder::new(TokioExecutor)
30223020
.handshake(stream)
30233021
.await
30243022
.unwrap();

tests/support/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,7 @@ async fn async_test(cfg: __TestConfig) {
427427
let stream = TcpStream::connect(addr).await.unwrap();
428428

429429
let res = if http2_only {
430-
let (mut sender, conn) = hyper::client::conn::http2::Builder::new()
431-
.executor(TokioExecutor)
430+
let (mut sender, conn) = hyper::client::conn::http2::Builder::new(TokioExecutor)
432431
.handshake(stream)
433432
.await
434433
.unwrap();
@@ -526,11 +525,11 @@ async fn naive_proxy(cfg: ProxyConfig) -> (SocketAddr, impl Future<Output = ()>)
526525
.unwrap();
527526

528527
let resp = if http2_only {
529-
let (mut sender, conn) = hyper::client::conn::http2::Builder::new()
530-
.executor(TokioExecutor)
531-
.handshake(stream)
532-
.await
533-
.unwrap();
528+
let (mut sender, conn) =
529+
hyper::client::conn::http2::Builder::new(TokioExecutor)
530+
.handshake(stream)
531+
.await
532+
.unwrap();
534533

535534
tokio::task::spawn(async move {
536535
if let Err(err) = conn.await {

0 commit comments

Comments
 (0)