Skip to content

Commit

Permalink
Merge branch 'develop' into empty-export
Browse files Browse the repository at this point in the history
  • Loading branch information
privatenumber committed Dec 2, 2023
2 parents 03ea0c6 + c80cc50 commit 811bca6
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions tests/specs/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,20 +283,17 @@ export default testSuite(({ describe }, node: NodeApis) => {
forceKillAfterTimeout: false,
});

await setTimeout(100);
await setTimeout(500);

if (process.platform === 'win32') {
expect(isProcessAlive(childPid!)).toBe(false);
} else {
expect(isProcessAlive(childPid!)).toBe(true);
process.kill(childPid!, 'SIGKILL');
// Note: SIGKILLing tsx process will leave the child hanging
}

const result = await tsxProcess;
const result = await tsxProcess;

// See test above
if (process.platform !== 'win32') {
// This is the exit code I get from testing manually with Node
expect(result.exitCode).toBe(137);
}
Expand Down

0 comments on commit 811bca6

Please sign in to comment.