@@ -200,7 +200,7 @@ mod integration {
200
200
let port = find_free_port ( ) ;
201
201
let directory = Url :: parse ( & format ! ( "https://localhost:{}" , port) ) . unwrap ( ) ;
202
202
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 ) ,
204
204
res = try_request_with_bad_keys( directory, bad_ohttp_keys, cert) => {
205
205
assert_eq!(
206
206
res. unwrap( ) . headers( ) . get( "content-type" ) . unwrap( ) ,
@@ -238,8 +238,8 @@ mod integration {
238
238
let directory = Url :: parse ( & format ! ( "https://localhost:{}" , directory_port) ) . unwrap ( ) ;
239
239
let gateway_origin = http:: Uri :: from_str ( directory. as_str ( ) ) . unwrap ( ) ;
240
240
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 ) ,
243
243
res = do_expiration_tests( ohttp_relay, directory, cert) => assert!( res. is_ok( ) , "v2 send receive failed: {:#?}" , res)
244
244
) ;
245
245
@@ -306,8 +306,8 @@ mod integration {
306
306
let directory = Url :: parse ( & format ! ( "https://localhost:{}" , directory_port) ) . unwrap ( ) ;
307
307
let gateway_origin = http:: Uri :: from_str ( directory. as_str ( ) ) . unwrap ( ) ;
308
308
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 ) ,
311
311
res = do_v2_send_receive( ohttp_relay, directory, cert) => assert!( res. is_ok( ) , "v2 send receive failed: {:#?}" , res)
312
312
) ;
313
313
@@ -438,8 +438,8 @@ mod integration {
438
438
let directory = Url :: parse ( & format ! ( "https://localhost:{}" , directory_port) ) . unwrap ( ) ;
439
439
let gateway_origin = http:: Uri :: from_str ( directory. as_str ( ) ) . unwrap ( ) ;
440
440
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 ) ,
443
443
res = do_v2_send_receive( ohttp_relay, directory, cert) => assert!( res. is_ok( ) , "v2 send receive failed: {:#?}" , res)
444
444
) ;
445
445
@@ -655,8 +655,8 @@ mod integration {
655
655
let directory = Url :: parse ( & format ! ( "https://localhost:{}" , directory_port) ) . unwrap ( ) ;
656
656
let gateway_origin = http:: Uri :: from_str ( directory. as_str ( ) ) . unwrap ( ) ;
657
657
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 ) ,
660
660
res = do_v1_to_v2( ohttp_relay, directory, cert) => assert!( res. is_ok( ) ) ,
661
661
) ;
662
662
0 commit comments