Finish tests and cleanup

moondance-labs · Oct 30, 2023 · 3b1e6e8 · 3b1e6e8
1 parent e3fb672
commit 3b1e6e8
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 151 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/package.json b/test/package.json
@@ -60,7 +60,6 @@
     },
     "dependencies": {
         "@zombienet/orchestrator": "^0.0.52",
-        "execa": "^8.0.1",
         "inquirer": "^9.2.11",
         "ps-node": "^0.1.6"
     }

diff --git a/test/scripts/zombienetRestart.ts b/test/scripts/zombienetRestart.ts
@@ -3,8 +3,6 @@ import { exec, spawn, execSync } from "child_process";
 import { readFileSync, writeFileSync, readlinkSync, unlinkSync } from "fs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import os from "os";
-import path from "path";
 import inquirer from "inquirer";
 
 const getEnvVariables = (pid: number) => {
@@ -112,7 +110,7 @@ yargs(hideBin(process.argv))
                     let { command, arguments: args } = processInfo;
 
                     if (argv["edit-cmd"]) {
-                        const tempFilePath = path.join(os.tmpdir(), `zombienet-restart-cmd-${Date.now()}.txt`);
+                        const tempFilePath = execSync("mktemp /tmp/zombienet-restart-cmd-XXXXXX").toString().trim();
                         writeFileSync(tempFilePath, `${command} ${args.join(" ")}`);
 
                         const editor = process.env.EDITOR || "vim"; // Default to 'vim' if EDITOR is not set
@@ -152,9 +150,14 @@ yargs(hideBin(process.argv))
                                 env: Object.fromEntries(envVariables.map((e) => e.split("=", 2))),
                             });
 
-                            process.on("SIGINT", () => {
-                                console.log('zombienetRestart: got SIGINT');
-                                child.kill("SIGINT");
+                            ["SIGINT", "SIGTERM"].forEach((signal) => {
+                                process.on(signal, () => {
+                                    console.log("zombienetRestart: got ", signal);
+                                    if (child) {
+                                        child.kill(signal);
+                                    }
+                                    process.exit();
+                                });
                             });
                         }, argv["wait-ms"]);
                     });