TINY-11177: Attempt to properly cancel when ctrl+c is pressed

tinymce · Jan 14, 2025 · 9e5effe · 9e5effe
1 parent 6b0857d
commit 9e5effe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/modules/server/src/main/ts/BedrockAuto.ts b/modules/server/src/main/ts/BedrockAuto.ts
@@ -90,6 +90,11 @@ export const go = (bedrockAutoSettings: BedrockAutoSettings): void => {
     });
     shutdownServices.push(service.shutdown, driver.shutdown);
 
+    const cancelEverything = Lifecycle.cancel(webdriver, shutdown(shutdownServices), settings.gruntDone);
+    process.on('SIGINT', cancelEverything);
+    process.on('SIGQUIT', cancelEverything);
+    process.on('SIGTERM', cancelEverything);
+
     try {
       if (!isHeadless) {
         console.log('bedrock-auto ' + Version.get() + ' available at: ' + location);

diff --git a/modules/server/src/main/ts/bedrock/core/Lifecycle.ts b/modules/server/src/main/ts/bedrock/core/Lifecycle.ts
@@ -50,3 +50,16 @@ export const error = async (err: Error | string, driver: Browser, shutdown: Shut
   await shutdown(true);
   exit(gruntDone, ExitCodes.failures.unexpected);
 };
+
+export const cancel = (driver: Browser, shutdown: ShutdownFn, gruntDone: GruntDoneFn): () => Promise<void> => {
+  let cancelled = false;
+  return async () => {
+    if (cancelled) {
+      return;
+    }
+    cancelled = true;
+    console.error(chalk.red('********** Cancelling test run **********'));
+    await shutdown(true);
+    exit(gruntDone, ExitCodes.failures.unexpected);
+  };
+};