make error mapping more precise and the test more specific

denoland · Sep 9, 2020 · 5de058c · 5de058c
1 parent 94ac53e
commit 5de058c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cli/errors.rs b/cli/errors.rs
@@ -156,10 +156,12 @@ fn get_url_parse_error_class(_error: &url::ParseError) -> &'static str {
 fn get_nix_error_class(error: &nix::Error) -> &'static str {
   use nix::errno::Errno::*;
   match error {
-    nix::Error::Sys(EPERM) => "PermissionDenied",
+    nix::Error::Sys(ECHILD) => "NotFound",
     nix::Error::Sys(EINVAL) => "TypeError",
     nix::Error::Sys(ENOENT) => "NotFound",
     nix::Error::Sys(ENOTTY) => "BadResource",
+    nix::Error::Sys(EPERM) => "PermissionDenied",
+    nix::Error::Sys(ESRCH) => "NotFound",
     nix::Error::Sys(UnknownErrno) => "Error",
     nix::Error::Sys(_) => "Error",
     nix::Error::InvalidPath => "TypeError",

diff --git a/cli/tests/unit/process_test.ts b/cli/tests/unit/process_test.ts
@@ -383,8 +383,16 @@ unitTest(
     });
     await p.status();
 
+    // On Windows the underlying Rust API returns `ERROR_ACCESS_DENIED`,
+    // which serves kind of as a catch all error code. More specific
+    // error codes do exist, e.g. `ERROR_WAIT_NO_CHILDREN`; it's unclear
+    // why they're not returned.
+    const expectedErrorType = Deno.build.os === "windows"
+      ? Deno.errors.PermissionDenied
+      : Deno.errors.NotFound;
     assertThrows(
-      () => p.kill(Deno.Signal.SIGQUIT),
+      () => p.kill(Deno.Signal.SIGTERM),
+      expectedErrorType,
     );
 
     p.close();