Skip to content

Commit 974cdca

Browse files
committed
debug long running errors
1 parent 153e6ac commit 974cdca

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

payjoin/tests/integration.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ mod integration {
200200
let port = find_free_port();
201201
let directory = Url::parse(&format!("https://localhost:{}", port)).unwrap();
202202
tokio::select!(
203-
_ = init_directory(port, (cert.clone(), key)) => panic!("Directory server is long running"),
203+
err = init_directory(port, (cert.clone(), key)) => panic!("Directory server exited early: {:?}", err),
204204
res = try_request_with_bad_keys(directory, bad_ohttp_keys, cert) => {
205205
assert_eq!(
206206
res.unwrap().headers().get("content-type").unwrap(),
@@ -238,8 +238,8 @@ mod integration {
238238
let directory = Url::parse(&format!("https://localhost:{}", directory_port)).unwrap();
239239
let gateway_origin = http::Uri::from_str(directory.as_str()).unwrap();
240240
tokio::select!(
241-
_ = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay is long running"),
242-
_ = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server is long running"),
241+
err = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay exited early: {:?}", err),
242+
err = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server exited early: {:?}", err),
243243
res = do_expiration_tests(ohttp_relay, directory, cert) => assert!(res.is_ok(), "v2 send receive failed: {:#?}", res)
244244
);
245245

@@ -306,8 +306,8 @@ mod integration {
306306
let directory = Url::parse(&format!("https://localhost:{}", directory_port)).unwrap();
307307
let gateway_origin = http::Uri::from_str(directory.as_str()).unwrap();
308308
tokio::select!(
309-
_ = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay is long running"),
310-
_ = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server is long running"),
309+
err = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay exited early: {:?}", err),
310+
err = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server exited early: {:?}", err),
311311
res = do_v2_send_receive(ohttp_relay, directory, cert) => assert!(res.is_ok(), "v2 send receive failed: {:#?}", res)
312312
);
313313

@@ -438,8 +438,8 @@ mod integration {
438438
let directory = Url::parse(&format!("https://localhost:{}", directory_port)).unwrap();
439439
let gateway_origin = http::Uri::from_str(directory.as_str()).unwrap();
440440
tokio::select!(
441-
_ = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay is long running"),
442-
_ = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server is long running"),
441+
err = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay exited early: {:?}", err),
442+
err = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server exited early: {:?}", err),
443443
res = do_v2_send_receive(ohttp_relay, directory, cert) => assert!(res.is_ok(), "v2 send receive failed: {:#?}", res)
444444
);
445445

@@ -655,8 +655,8 @@ mod integration {
655655
let directory = Url::parse(&format!("https://localhost:{}", directory_port)).unwrap();
656656
let gateway_origin = http::Uri::from_str(directory.as_str()).unwrap();
657657
tokio::select!(
658-
_ = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay is long running"),
659-
_ = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server is long running"),
658+
err = ohttp_relay::listen_tcp(ohttp_relay_port, gateway_origin) => panic!("Ohttp relay exited early: {:?}", err),
659+
err = init_directory(directory_port, (cert.clone(), key)) => panic!("Directory server exited early: {:?}", err),
660660
res = do_v1_to_v2(ohttp_relay, directory, cert) => assert!(res.is_ok()),
661661
);
662662

0 commit comments

Comments
 (0)