diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index 8655f3351c6b51..81007c5f6bdf1e 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -38,10 +38,12 @@ const RELEASE_URL: &str = "https://github.com/denoland/deno/releases"; const CANARY_URL: &str = "https://dl.deno.land/canary"; const RC_URL: &str = "https://dl.deno.land/release"; -static EXAMPLE_USAGE: &str = cstr!("Example usage: +static EXAMPLE_USAGE: &str = cstr!("Usage: Latest version: deno upgrade Specific version: deno upgrade 1.46.3 - Release Candidate: deno upgrade rc + + Release candidate: deno upgrade rc + Canary: deno upgrade canary Specific canary: deno upgrade 30687c786c37090ac0e4e2c3824b1b5cf313599f"); diff --git a/tests/specs/upgrade/invalid_version/canary.out b/tests/specs/upgrade/invalid_version/canary.out index a1819ce34f6f89..bd54a9a2016e7a 100644 --- a/tests/specs/upgrade/invalid_version/canary.out +++ b/tests/specs/upgrade/invalid_version/canary.out @@ -2,9 +2,11 @@ error: Invalid commit hash passed (asdfasdf) Pass a semver, or a full 40 character git commit hash, or a release channel name. -Example usage: +Usage: Latest version: deno upgrade Specific version: deno upgrade 1.46.3 - Release Candidate: deno upgrade rc + + Release candidate: deno upgrade rc + Canary: deno upgrade canary Specific canary: deno upgrade 30687c786c37090ac0e4e2c3824b1b5cf313599f diff --git a/tests/specs/upgrade/invalid_version/shorthand.out b/tests/specs/upgrade/invalid_version/shorthand.out index 6033c45b392830..91c7a381c4b454 100644 --- a/tests/specs/upgrade/invalid_version/shorthand.out +++ b/tests/specs/upgrade/invalid_version/shorthand.out @@ -2,9 +2,11 @@ error: Invalid version passed (asdfasdf) Pass a semver, or a full 40 character git commit hash, or a release channel name. -Example usage: +Usage: Latest version: deno upgrade Specific version: deno upgrade 1.46.3 - Release Candidate: deno upgrade rc + + Release candidate: deno upgrade rc + Canary: deno upgrade canary Specific canary: deno upgrade 30687c786c37090ac0e4e2c3824b1b5cf313599f diff --git a/tests/specs/upgrade/invalid_version/version.out b/tests/specs/upgrade/invalid_version/version.out index 6033c45b392830..91c7a381c4b454 100644 --- a/tests/specs/upgrade/invalid_version/version.out +++ b/tests/specs/upgrade/invalid_version/version.out @@ -2,9 +2,11 @@ error: Invalid version passed (asdfasdf) Pass a semver, or a full 40 character git commit hash, or a release channel name. -Example usage: +Usage: Latest version: deno upgrade Specific version: deno upgrade 1.46.3 - Release Candidate: deno upgrade rc + + Release candidate: deno upgrade rc + Canary: deno upgrade canary Specific canary: deno upgrade 30687c786c37090ac0e4e2c3824b1b5cf313599f diff --git a/tests/unit/serve_test.ts b/tests/unit/serve_test.ts index 9d23f8df25257f..28d541ed71cfa9 100644 --- a/tests/unit/serve_test.ts +++ b/tests/unit/serve_test.ts @@ -793,8 +793,8 @@ Deno.test( async function httpServerDefaultOnListenCallback() { const ac = new AbortController(); - const consoleLog = console.log; - console.log = (msg) => { + const consoleError = console.error; + console.error = (msg) => { try { const match = msg.match( /Listening on http:\/\/(localhost|0\.0\.0\.0):(\d+)\//, @@ -819,7 +819,7 @@ Deno.test( await server.finished; } finally { - console.log = consoleLog; + console.error = consoleError; } }, );