File tree Expand file tree Collapse file tree 3 files changed +21
-18
lines changed
linkerd/app/integration/src/tests Expand file tree Collapse file tree 3 files changed +21
-18
lines changed Original file line number Diff line number Diff line change @@ -120,6 +120,9 @@ jobs:
120120 - name : Install Rust (rustup)
121121 run : rustup update stable --no-self-update && rustup default stable
122122 shell : bash
123+ - name : Install nextest
124+ run : curl -LsSf https://get.nexte.st/latest/windows-tar | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
125+ shell : bash
123126 - run : rustup target add x86_64-pc-windows-gnu
124127 - name : Install nasm
125128 run : choco install nasm
@@ -137,8 +140,10 @@ jobs:
137140 run : cargo fmt -- --check
138141 - name : clippy
139142 run : cargo clippy --target=x86_64-pc-windows-gnu --workspace --all-targets --frozen
143+ - name : tests no run
144+ run : cargo nextest run --target=x86_64-pc-windows-gnu --workspace --frozen --exclude=linkerd2-proxy --no-run
140145 - name : tests
141- run : cargo test --target=x86_64-pc-windows-gnu --workspace --exclude=linkerd2-proxy --frozen
146+ run : cargo nextest run --target=x86_64-pc-windows-gnu --workspace --frozen -- exclude=linkerd2-proxy
142147
143148
144149 # rust-crates:
Original file line number Diff line number Diff line change @@ -882,21 +882,19 @@ async fn metrics_have_no_double_commas() {
882882}
883883
884884#[ cfg( target_os = "linux" ) ]
885- mod process {
886- #[ tokio:: test]
887- async fn metrics_has_start_time ( ) {
888- let Fixture {
889- metrics,
890- proxy : _proxy,
891- _profile,
892- dst_tx : _dst_tx,
893- pol_out_tx : _pol_out_tx,
894- ..
895- } = Fixture :: inbound ( ) . await ;
896- let uptime_regex = regex:: Regex :: new ( r"process_start_time_seconds \d+" )
897- . expect ( "compiling regex shouldn't fail" ) ;
898- assert_eventually ! ( uptime_regex. find( & metrics. get( "/metrics" ) . await ) . is_some( ) )
899- }
885+ #[ tokio:: test]
886+ async fn metrics_has_start_time ( ) {
887+ let Fixture {
888+ metrics,
889+ proxy : _proxy,
890+ _profile,
891+ dst_tx : _dst_tx,
892+ pol_out_tx : _pol_out_tx,
893+ ..
894+ } = Fixture :: inbound ( ) . await ;
895+ let uptime_regex = regex:: Regex :: new ( r"process_start_time_seconds \d+" )
896+ . expect ( "compiling regex shouldn't fail" ) ;
897+ assert_eventually ! ( uptime_regex. find( & metrics. get( "/metrics" ) . await ) . is_some( ) )
900898}
901899
902900mod transport {
Original file line number Diff line number Diff line change @@ -1369,8 +1369,8 @@ mod proxy_to_proxy {
13691369 "transparency.test.svc.cluster.local" ,
13701370 ) ;
13711371 let res = client. request ( client. request_builder ( "/" ) ) . await . unwrap ( ) ;
1372- // tracing::info!(res);
1373- assert_eq ! ( res. status( ) , http:: StatusCode :: BAD_GATEWAY ) ;
1372+ tracing:: info!( "result {:?}" , res) ;
1373+ assert_eq ! ( res. status( ) , http:: StatusCode :: GATEWAY_TIMEOUT ) ;
13741374
13751375 // ensure panics from the server are propagated
13761376 proxies. join_servers ( ) . await ;
You can’t perform that action at this time.
0 commit comments