Merge pull request #41 from Hexagon/async-fix-wip

Fix non finished tests (WIP)
Hexagon · Aug 18, 2023 · f572d42 · f572d42
2 parents aecdfe2 + 95984bd
commit f572d42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/core/process.ts b/lib/core/process.ts
@@ -286,7 +286,7 @@ class Process {
       } else {
         this.pup.logger.log("stopping", `Stopping process, reason: ${reason}`, this.config)
       }
-      this.killRunner(reason, "SIGTERM")
+      return this.killRunner(reason, "SIGTERM")
     }).catch(() => false)
 
     // Kill process after `terminateTimeout`
@@ -304,7 +304,7 @@ class Process {
       // Using `any` because event payload is not typed yet
       // deno-lint-ignore no-explicit-any
       const onFinish = (ev: any) => {
-        if (ev.status?.pid == this.getStatus().pid && [ProcessState.FINISHED, ProcessState.EXHAUSTED].includes(this.status)) {
+        if (ev.status?.pid == this.getStatus().pid && [ProcessState.FINISHED, ProcessState.EXHAUSTED, ProcessState.ERRORED].includes(this.status)) {
           abortTimers.abort()
           this.pup.events.off("process_status_changed", onFinish)
           // ToDo, resolve to whatever `killRunner()` returns, which is currently unavailable inside the `process_status_changed` event, so it's fixed to `true` by now

diff --git a/test/core/pup.test.ts b/test/core/pup.test.ts
@@ -40,7 +40,7 @@ Deno.test({
     // Stop process, assert stopped
     const stopResult = await pup.stop(TEST_PROCESS_ID, "test")
     assertEquals(stopResult, true)
-    assertEquals(testProcess?.getStatus().status, ProcessState.FINISHED)
+    assertEquals(testProcess?.getStatus().status, ProcessState.ERRORED)
 
     // Block process, assert blocked
     const blockResult = pup.block(TEST_PROCESS_ID, "test")
@@ -50,7 +50,7 @@ Deno.test({
     // Start process, assert failed
     const startResult2 = pup.start(TEST_PROCESS_ID, "test")
     assertEquals(startResult2, false)
-    assertEquals(testProcess?.getStatus().status, ProcessState.FINISHED)
+    assertEquals(testProcess?.getStatus().status, ProcessState.ERRORED)
 
     // Unblock process, assert unblocked
     const unblockResult = pup.unblock(TEST_PROCESS_ID, "test")
@@ -101,7 +101,7 @@ Deno.test({
     // Stop process, assert finished
     const stopResult = await pup.stop(TEST_PROCESS_ID, "test")
     assertEquals(stopResult, true)
-    assertEquals(testProcess?.getStatus().status, ProcessState.FINISHED)
+    assertEquals(testProcess?.getStatus().status, ProcessState.ERRORED)
 
     // Block process, assert blocked
     const blockResult = pup.block(TEST_PROCESS_ID, "test")
@@ -111,7 +111,7 @@ Deno.test({
     // Start process, assert failed
     const startResult2 = pup.start(TEST_PROCESS_ID, "test")
     assertEquals(startResult2, false)
-    assertEquals(testProcess?.getStatus().status, ProcessState.FINISHED)
+    assertEquals(testProcess?.getStatus().status, ProcessState.ERRORED)
 
     // Unblock process, assert unblocked
     const unblockResult = pup.unblock(TEST_PROCESS_ID, "test")