Fix expected output in SIGINT test on Windows

open-cli-tools · Aug 22, 2022 · 7f9be6c · 7f9be6c
1 parent 1c3fbf6
commit 7f9be6c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/bin/concurrently.spec.ts b/bin/concurrently.spec.ts
@@ -15,7 +15,8 @@ const isWindows = process.platform === 'win32';
 const createKillMessage = (prefix: string, signal: 'SIGTERM' | 'SIGINT') => {
     const map: Record<string, string | number> = {
         SIGTERM: isWindows ? 1 : '(SIGTERM|143)',
-        SIGINT: isWindows ? 3221225786 : '(SIGINT|130)',
+        // Could theoretically be anything (e.g. 0) if process has SIGINT handler
+        SIGINT: isWindows ? '(3221225786|0)' : '(SIGINT|130|0)',
     };
     return new RegExp(escapeRegExp(prefix) + ' exited with code ' + map[signal]);
 };
@@ -188,7 +189,15 @@ describe('exiting conditions', () => {
 
         expect(exit.code).toBe(0);
         expect(lines).toContainEqual(
-            expect.stringMatching(createKillMessage('[0] node fixtures/read-echo.js', 'SIGINT'))
+            expect.stringMatching(
+                createKillMessage(
+                    isWindows
+                        ? // '^C' is echoed by read-echo.js (also happens without the wrapper)
+                          '[0] ^Cnode fixtures/read-echo.js'
+                        : '[0] node fixtures/read-echo.js',
+                    'SIGINT'
+                )
+            )
         );
     });
 });