foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 15:24:46 -05:00
Code Issues Packages 1 Wiki Activity

chore: fix upgrade_prompt test on main (#21314)

Browse source 
Issue was main does canary builds, which broke this test because it
didn't handle searching for a canary release. Tested by building as
canary locally.
This commit is contained in:
David Sherret 2023-11-23 12:54:27 -05:00 committed by GitHub
parent 68a0877f8d
commit d8961a9dfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/tests/integration/upgrade_tests.rs
View file

@ -223,7 +223,11 @@ fn upgrade_prompt() {
// - We need to use a pty here because the upgrade prompt
// doesn't occur except when there's a pty.
// - Version comes from the test server.
pty.expect(" 99999.99.99 Run `deno upgrade` to install it.");
pty.expect_any(&[
" 99999.99.99 Run `deno upgrade` to install it.",
// it builds canary releases on main, so check for this in that case
"Run `deno upgrade --canary` to install it.",
]);
});
}

17
test_util/src/lib.rs
View file

@ -1282,6 +1282,15 @@ async fn main_server(
.unwrap(),
);
}
(&hyper::Method::GET, "/upgrade/sleep/canary-latest.txt") => {
tokio::time::sleep(Duration::from_secs(45)).await;
return Ok(
Response::builder()
.status(StatusCode::OK)
.body(Body::from("bda3850f84f24b71e02512c1ba2d6bf2e3daa2fd"))
.unwrap(),
);
}
(&hyper::Method::GET, "/release-latest.txt") => {
return Ok(
Response::builder()
@ -1291,6 +1300,14 @@ async fn main_server(
.unwrap(),
);
}
(&hyper::Method::GET, "/canary-latest.txt") => {
return Ok(
Response::builder()
.status(StatusCode::OK)
.body(Body::from("bda3850f84f24b71e02512c1ba2d6bf2e3daa2fd"))
.unwrap(),
);
}
_ => {
let mut file_path = testdata_path().to_path_buf();
file_path.push(&req.uri().path()[1..].replace("%2f", "/"));