fixup! test: split test-runner-watch-mode-kill-signal

Author: joyeecheung

test/common/index.js

@@ -913,20 +913,6 @@ function expectRequiredTLAError(err) {
   }
 }
 
-function skipIfNoWatchModeSignals() {
-  if (exports.isWindows) {
-    skip('no signals on Windows');
-  }
-
-  if (exports.isIBMi) {
-    skip('IBMi does not support `fs.watch()`');
-  }
-
-  if (exports.isAIX) {
-    skip('folder watch capability is limited in AIX.');
-  }
-}
-
 const common = {
   allowGlobals,
   buildType,
@@ -974,7 +960,6 @@ const common = {
   skipIf32Bits,
   skipIfEslintMissing,
   skipIfInspectorDisabled,
-  skipIfNoWatchModeSignals,
   skipIfSQLiteMissing,
   spawnPromisified,
 

test/common/index.mjs

@@ -46,7 +46,6 @@ const {
   skipIf32Bits,
   skipIfEslintMissing,
   skipIfInspectorDisabled,
-  skipIfNoWatchModeSignals,
   skipIfSQLiteMissing,
   spawnPromisified,
 } = common;
@@ -98,7 +97,6 @@ export {
   skipIf32Bits,
   skipIfEslintMissing,
   skipIfInspectorDisabled,
-  skipIfNoWatchModeSignals,
   skipIfSQLiteMissing,
   spawnPromisified,
 };

test/common/watch.js

@@ -0,0 +1,16 @@
+'use strict';
+const common = require('./index.js');
+
+exports.skipIfNoWatchModeSignals = function() {
+  if (common.isWindows) {
+    skip('no signals on Windows');
+  }
+
+  if (common.isIBMi) {
+    skip('IBMi does not support `fs.watch()`');
+  }
+
+  if (common.isAIX) {
+    skip('folder watch capability is limited in AIX.');
+  }
+}

test/parallel/test-watch-mode-kill-signal-default.mjs

@@ -1,12 +1,13 @@
 // Test that the kill signal sent by --watch defaults to SIGTERM.
 
-import { skipIfNoWatchModeSignals } from '../common/index.mjs';
+import '../common/index.mjs';
 import assert from 'node:assert';
 import { writeFileSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
 import tmpdir from '../common/tmpdir.js';
 import fixtures from '../common/fixtures.js';
+import { skipIfNoWatchModeSignals } from '../common/watch.js';
 
 skipIfNoWatchModeSignals();
 

test/parallel/test-watch-mode-kill-signal-invalid.mjs

@@ -1,11 +1,12 @@
 // Test that --watch-kill-signal errors when an invalid kill signal is provided.
 
-import { skipIfNoWatchModeSignals } from '../common/index.mjs';
+import '../common/index.mjs';
 import assert from 'node:assert';
 import { writeFileSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import tmpdir from '../common/tmpdir.js';
 import fixtures from '../common/fixtures.js';
+import { skipIfNoWatchModeSignals } from '../common/watch.js';
 
 skipIfNoWatchModeSignals();
 

test/parallel/test-watch-mode-kill-signal-override.mjs

@@ -1,13 +1,14 @@
 // Test that the kill signal sent by --watch can be overridden to SIGINT
 // by using --watch-kill-signal.
 
-import { skipIfNoWatchModeSignals } from '../common/index.mjs';
+import '../common/index.mjs';
 import assert from 'node:assert';
 import { writeFileSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
 import tmpdir from '../common/tmpdir.js';
 import fixtures from '../common/fixtures.js';
+import { skipIfNoWatchModeSignals } from '../common/watch.js';
 
 skipIfNoWatchModeSignals();