wip

denoland · Sep 7, 2024 · 26218a7 · 26218a7
1 parent 2e836b9
commit 26218a7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git 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:    <p(245)>deno upgrade</>
   Specific version:  <p(245)>deno upgrade 1.46.3</>
-  Release Candidate: <p(245)>deno upgrade rc</>
+
+  Release candidate: <p(245)>deno upgrade rc</>
+
   Canary:            <p(245)>deno upgrade canary</>
   Specific canary:   <p(245)>deno upgrade 30687c786c37090ac0e4e2c3824b1b5cf313599f</>");
 

diff --git 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
@@ -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
@@ -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
@@ -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;
     }
   },
 );