Skip to content

Commit 090a1c1

Browse files
committed
nextest
Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
1 parent 9e7adb6 commit 090a1c1

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

.github/workflows/pr.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,16 @@ 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
126129
shell: cmd
130+
- name: Install protoc
131+
run: choco install protoc
132+
shell: cmd
127133
- name: Install LLVM and Clang
128134
uses: KyleMayes/install-llvm-action@v2.0.5
129135
with:
@@ -137,8 +143,12 @@ jobs:
137143
run: cargo fmt -- --check
138144
- name: clippy
139145
run: cargo clippy --target=x86_64-pc-windows-gnu --workspace --all-targets --frozen
146+
- name: tests no run
147+
run: cargo nextest run --target=x86_64-pc-windows-gnu --workspace --frozen --exclude=linkerd2-proxy --no-run
140148
- name: tests
141-
run: cargo test --target=x86_64-pc-windows-gnu --workspace --exclude=linkerd2-proxy --frozen
149+
run: cargo nextest run --target=x86_64-pc-windows-gnu --workspace --frozen --exclude=linkerd2-proxy
150+
env:
151+
NEXTEST_RETRIES: 3
142152

143153

144154
# rust-crates:

linkerd/app/integration/src/tests/telemetry.rs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff 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

902900
mod transport {

linkerd/app/integration/src/tests/transparency.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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;

0 commit comments

Comments
 (0)