summaryrefslogtreecommitdiff
path: root/cli/tests/unit
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tests/unit')
-rw-r--r--cli/tests/unit/process_test.ts32
-rw-r--r--cli/tests/unit/signal_test.ts58
2 files changed, 43 insertions, 47 deletions
diff --git a/cli/tests/unit/process_test.ts b/cli/tests/unit/process_test.ts
index 2d0a15b16..73df3fa91 100644
--- a/cli/tests/unit/process_test.ts
+++ b/cli/tests/unit/process_test.ts
@@ -120,7 +120,12 @@ unitTest(
},
async function runCommandFailedWithSignal() {
const p = Deno.run({
- cmd: [Deno.execPath(), "eval", "--unstable", "Deno.kill(Deno.pid, 9)"],
+ cmd: [
+ Deno.execPath(),
+ "eval",
+ "--unstable",
+ "Deno.kill(Deno.pid, 'SIGKILL')",
+ ],
});
const status = await p.status();
assertEquals(status.success, false);
@@ -436,7 +441,7 @@ unitTest(
let error = null;
try {
- p.kill(Deno.Signal.SIGTERM);
+ p.kill("SIGTERM");
} catch (e) {
error = e;
}
@@ -454,21 +459,13 @@ unitTest(
},
);
-unitTest(function signalNumbers() {
- if (Deno.build.os === "darwin") {
- assertEquals(Deno.Signal.SIGSTOP, 17);
- } else if (Deno.build.os === "linux") {
- assertEquals(Deno.Signal.SIGSTOP, 19);
- }
-});
-
unitTest(function killPermissions() {
assertThrows(() => {
// Unlike the other test cases, we don't have permission to spawn a
// subprocess we can safely kill. Instead we send SIGCONT to the current
// process - assuming that Deno does not have a special handler set for it
// and will just continue even if a signal is erroneously sent.
- Deno.kill(Deno.pid, Deno.Signal.SIGCONT);
+ Deno.kill(Deno.pid, "SIGCONT");
}, Deno.errors.PermissionDenied);
});
@@ -479,19 +476,17 @@ unitTest(
cmd: [Deno.execPath(), "eval", "setTimeout(() => {}, 10000)"],
});
- assertEquals(Deno.Signal.SIGINT, 2);
- Deno.kill(p.pid, Deno.Signal.SIGINT);
+ Deno.kill(p.pid, "SIGINT");
const status = await p.status();
assertEquals(status.success, false);
try {
- assertEquals(status.code, 128 + Deno.Signal.SIGINT);
- assertEquals(status.signal, Deno.Signal.SIGINT);
+ assertEquals(status.signal, "SIGINT");
} catch {
// TODO(nayeemrmn): On Windows sometimes the following values are given
// instead. Investigate and remove this catch when fixed.
- assertEquals(status.code, 1);
- assertEquals(status.signal, undefined);
+ assertEquals(status.code, 130);
+ assertEquals(status.signal, 2);
}
p.close();
},
@@ -505,7 +500,8 @@ unitTest({ perms: { run: true, read: true } }, function killFailed() {
assert(!p.stdout);
assertThrows(() => {
- Deno.kill(p.pid, 12345);
+ // @ts-expect-error testing runtime error of bad signal
+ Deno.kill(p.pid, "foobar");
}, TypeError);
p.close();
diff --git a/cli/tests/unit/signal_test.ts b/cli/tests/unit/signal_test.ts
index d0cd40950..9afa737ee 100644
--- a/cli/tests/unit/signal_test.ts
+++ b/cli/tests/unit/signal_test.ts
@@ -13,84 +13,84 @@ unitTest(
function signalsNotImplemented() {
assertThrows(
() => {
- Deno.signal(1);
+ Deno.signal("SIGINT");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.alarm(); // for SIGALRM
+ Deno.signal("SIGALRM");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.child(); // for SIGCHLD
+ Deno.signal("SIGCHLD");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.hungup(); // for SIGHUP
+ Deno.signal("SIGHUP");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.interrupt(); // for SIGINT
+ Deno.signal("SIGINT");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.io(); // for SIGIO
+ Deno.signal("SIGIO");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.pipe(); // for SIGPIPE
+ Deno.signal("SIGPIPE");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.quit(); // for SIGQUIT
+ Deno.signal("SIGQUIT");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.terminate(); // for SIGTERM
+ Deno.signal("SIGTERM");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.userDefined1(); // for SIGUSR1
+ Deno.signal("SIGUSR1");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.userDefined2(); // for SIGURS2
+ Deno.signal("SIGUSR2");
},
Error,
"not implemented",
);
assertThrows(
() => {
- Deno.signals.windowChange(); // for SIGWINCH
+ Deno.signal("SIGWINCH");
},
Error,
"not implemented",
@@ -106,12 +106,12 @@ unitTest(
const t = setInterval(() => {}, 1000);
let c = 0;
- const sig = Deno.signal(Deno.Signal.SIGUSR1);
+ const sig = Deno.signal("SIGUSR1");
setTimeout(async () => {
await delay(20);
for (const _ of Array(3)) {
// Sends SIGUSR1 3 times.
- Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
+ Deno.kill(Deno.pid, "SIGUSR1");
await delay(20);
}
sig.dispose();
@@ -138,7 +138,7 @@ unitTest(
Deno.execPath(),
"eval",
"--unstable",
- "(async () => { for await (const _ of Deno.signals.io()) {} })()",
+ "(async () => { for await (const _ of Deno.signal('SIGIO')) {} })()",
],
});
const res = await p.status();
@@ -154,9 +154,9 @@ unitTest(
// This prevents the program from exiting.
const t = setInterval(() => {}, 1000);
- const sig = Deno.signal(Deno.Signal.SIGUSR1);
+ const sig = Deno.signal("SIGUSR1");
setTimeout(() => {
- Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
+ Deno.kill(Deno.pid, "SIGUSR1");
resolvable.resolve();
}, 20);
await sig;
@@ -176,7 +176,7 @@ unitTest(
const t = setInterval(() => {}, 1000);
let called = false;
- const sig = Deno.signal(Deno.Signal.SIGUSR1);
+ const sig = Deno.signal("SIGUSR1");
sig.then(() => {
called = true;
});
@@ -200,37 +200,37 @@ unitTest(
{ ignore: Deno.build.os === "windows", perms: { run: true } },
function signalShorthandsTest() {
let s: Deno.SignalStream;
- s = Deno.signals.alarm(); // for SIGALRM
+ s = Deno.signal("SIGALRM");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.child(); // for SIGCHLD
+ s = Deno.signal("SIGCHLD");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.hungup(); // for SIGHUP
+ s = Deno.signal("SIGHUP");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.interrupt(); // for SIGINT
+ s = Deno.signal("SIGINT");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.io(); // for SIGIO
+ s = Deno.signal("SIGIO");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.pipe(); // for SIGPIPE
+ s = Deno.signal("SIGPIPE");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.quit(); // for SIGQUIT
+ s = Deno.signal("SIGQUIT");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.terminate(); // for SIGTERM
+ s = Deno.signal("SIGTERM");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.userDefined1(); // for SIGUSR1
+ s = Deno.signal("SIGUSR1");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.userDefined2(); // for SIGURS2
+ s = Deno.signal("SIGUSR2");
assert(s instanceof Deno.SignalStream);
s.dispose();
- s = Deno.signals.windowChange(); // for SIGWINCH
+ s = Deno.signal("SIGWINCH");
assert(s instanceof Deno.SignalStream);
s.dispose();
},
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 12:58:46 +0000