Skip to content

Commit

Permalink
fix: panic on process.kill() after run (#7405)
Browse files Browse the repository at this point in the history
This commit fixes panic caused by "unimplemented!()"
calls for some variants of "nix::errno::Errno".

Catch-all variant now returns "Error" class name
instead of panicking.

Co-authored-by: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
bartlomieju and piscisaureus committed Sep 9, 2020
1 parent 839c59b commit 2423a86
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
8 changes: 5 additions & 3 deletions cli/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,14 @@ 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(UnknownErrno) => unreachable!(),
nix::Error::Sys(_) => unreachable!(),
nix::Error::Sys(EPERM) => "PermissionDenied",
nix::Error::Sys(ESRCH) => "NotFound",
nix::Error::Sys(UnknownErrno) => "Error",
nix::Error::Sys(_) => "Error",
nix::Error::InvalidPath => "TypeError",
nix::Error::InvalidUtf8 => "InvalidData",
nix::Error::UnsupportedOperation => unreachable!(),
Expand Down
24 changes: 24 additions & 0 deletions cli/tests/unit/process_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,30 @@ unitTest({ perms: { run: true } }, async function runClose(): Promise<void> {
p.stderr.close();
});

unitTest(
{ perms: { run: true } },
async function runKillAfterStatus(): Promise<void> {
const p = Deno.run({
cmd: ["python", "-c", 'print("hello")'],
});
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.SIGTERM),
expectedErrorType,
);

p.close();
},
);

unitTest(function signalNumbers(): void {
if (Deno.build.os === "darwin") {
assertEquals(Deno.Signal.SIGSTOP, 17);
Expand Down

0 comments on commit 2423a86

Please sign in to comment.