Merge 781a606 into 676f9b5

sorenlouv · Jul 24, 2021 · 8d50664 · 8d50664
2 parents 676f9b5 + 781a606
commit 8d50664
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/test/inquirer.private.test.ts b/src/test/inquirer.private.test.ts
@@ -171,13 +171,15 @@ function runBackportAsync(
     ...options,
   ]);
 
-  return new Promise<string>((resolve, reject) => {
+  const p = new Promise<string>((resolve, reject) => {
     let data = '';
 
     // fail if expectations hasn't been found within 4s
+    const TIMEOUT_IN_SECONDS = 4;
     const timeout = setTimeout(() => {
-      reject(`Expectation "${waitForString}" not found in: ${data.toString()}`);
-    }, 4000);
+      reject(`Expectation '${waitForString}' not found within ${TIMEOUT_IN_SECONDS} seconds in:
+      '${data.toString()}'`);
+    }, TIMEOUT_IN_SECONDS * 1000);
 
     proc.stdout.on('data', (dataChunk) => {
       data += dataChunk;
@@ -186,9 +188,15 @@ function runBackportAsync(
       if (!waitForString || output.includes(waitForString)) {
         clearTimeout(timeout);
         // remove ansi codes and whitespace
-        resolve(stripAnsi(output).replace(/\s+$/gm, ''));
-        proc.kill();
+        const strippedOutput = stripAnsi(output).replace(/\s+$/gm, '');
+
+        resolve(strippedOutput);
       }
     });
   });
+
+  // kill child process
+  return p.finally(() => {
+    proc.kill();
+  });
 }