fixup! test: split test-fs-watch-ignore-*

Author: lpinca

test/parallel/parallel.status

@@ -76,14 +76,32 @@ test-domain-throw-error-then-throw-from-uncaught-exception-handler: PASS, FLAKY
 test-domain-with-abort-on-uncaught-exception: PASS, FLAKY
 # https://github.com/nodejs/node/issues/54346
 test-esm-loader-hooks-inspect-wait: PASS, FLAKY
+# https://github.com/nodejs/node/issues/61520
 test-fs-promises-watch-iterator: SKIP
+test-fs-promises-watch-ignore-function: SKIP
+test-fs-promises-watch-ignore-glob: SKIP
+test-fs-promises-watch-ignore-mixed: SKIP
+test-fs-promises-watch-ignore-regexp: SKIP
+test-fs-watch-ignore-function: SKIP
+test-fs-watch-ignore-glob: SKIP
+test-fs-watch-ignore-mixed: SKIP
+test-fs-watch-ignore-regexp: SKIP
 # https://github.com/nodejs/node/issues/50050
 test-tick-processor-arguments: SKIP
 
 [$system==freebsd]
 # https://github.com/nodejs/node/issues/54346
 test-esm-loader-hooks-inspect-wait: PASS, FLAKY
+# https://github.com/nodejs/node/issues/61520
 test-fs-promises-watch-iterator: SKIP
+test-fs-promises-watch-ignore-function: SKIP
+test-fs-promises-watch-ignore-glob: SKIP
+test-fs-promises-watch-ignore-mixed: SKIP
+test-fs-promises-watch-ignore-regexp: SKIP
+test-fs-watch-ignore-function: SKIP
+test-fs-watch-ignore-glob: SKIP
+test-fs-watch-ignore-mixed: SKIP
+test-fs-watch-ignore-regexp: SKIP
 
 [$system==aix]
 # https://github.com/nodejs/node/issues/54346

test/parallel/test-fs-promises-watch-ignore-function.mjs

@@ -3,12 +3,10 @@ import { skipIfNoWatch } from '../common/watch.js';
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = await import('node:assert');
 const path = await import('node:path');
 const tmpdir = await import('../common/tmpdir.js');
+const { setTimeout } = await import('node:timers/promises');
 const { watch } = await import('node:fs/promises');
 const { writeFileSync } = await import('node:fs');
 
@@ -20,21 +18,29 @@ const ignoreFile = '.hidden';
 const keepFilePath = path.join(testDir, keepFile);
 const ignoreFilePath = path.join(testDir, ignoreFile);
 
-const watcher = watch(testDir, {
-  ignore: (filename) => filename.startsWith('.'),
-});
+async function watchDir() {
+  const watcher = watch(testDir, {
+    ignore: (filename) => filename.startsWith('.'),
+  });
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
-  writeFileSync(ignoreFilePath, 'ignored');
-  writeFileSync(keepFilePath, 'content');
-}, common.platformTimeout(100));
+  for await (const { filename } of watcher) {
+    assert.notStrictEqual(filename, ignoreFile);
 
-for await (const { filename } of watcher) {
-  assert.notStrictEqual(filename, ignoreFile);
+    if (filename === keepFile) {
+      break;
+    }
+  }
+}
 
-  if (filename === keepFile) {
-    break;
+async function writeFiles() {
+  if (common.isMacOS) {
+    // Do the write with a delay to ensure that the OS is ready to notify us.
+    // See https://github.com/nodejs/node/issues/52601.
+    await setTimeout(common.platformTimeout(100));
   }
+
+  writeFileSync(ignoreFilePath, 'ignored');
+  writeFileSync(keepFilePath, 'content');
 }
+
+await Promise.all([watchDir(), writeFiles()]);

test/parallel/test-fs-promises-watch-ignore-glob.mjs

@@ -3,12 +3,10 @@ import { skipIfNoWatch } from '../common/watch.js';
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = await import('node:assert');
 const path = await import('node:path');
 const tmpdir = await import('../common/tmpdir.js');
+const { setTimeout } = await import('node:timers/promises');
 const { watch } = await import('node:fs/promises');
 const { writeFileSync } = await import('node:fs');
 
@@ -20,19 +18,27 @@ const ignoreFile = 'ignore.log';
 const keepFilePath = path.join(testDir, keepFile);
 const ignoreFilePath = path.join(testDir, ignoreFile);
 
-const watcher = watch(testDir, { ignore: '*.log' });
+async function watchDir() {
+  const watcher = watch(testDir, { ignore: '*.log' });
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
-  writeFileSync(ignoreFilePath, 'ignored');
-  writeFileSync(keepFilePath, 'content');
-}, common.platformTimeout(100));
+  for await (const { filename } of watcher) {
+    assert.notStrictEqual(filename, ignoreFile);
 
-for await (const { filename } of watcher) {
-  assert.notStrictEqual(filename, ignoreFile);
+    if (filename === keepFile) {
+      break;
+    }
+  }
+}
 
-  if (filename === keepFile) {
-    break;
+async function writeFiles() {
+  if (common.isMacOS) {
+    // Do the write with a delay to ensure that the OS is ready to notify us.
+    // See https://github.com/nodejs/node/issues/52601.
+    await setTimeout(common.platformTimeout(100));
   }
+
+  writeFileSync(ignoreFilePath, 'ignored');
+  writeFileSync(keepFilePath, 'content');
 }
+
+await Promise.all([watchDir(), writeFiles()]);

test/parallel/test-fs-promises-watch-ignore-mixed.mjs

@@ -3,12 +3,10 @@ import { skipIfNoWatch } from '../common/watch.js';
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = await import('node:assert');
 const path = await import('node:path');
 const tmpdir = await import('../common/tmpdir.js');
+const { setTimeout } = await import('node:timers/promises');
 const { watch } = await import('node:fs/promises');
 const { writeFileSync } = await import('node:fs');
 
@@ -22,26 +20,34 @@ const keepFilePath = path.join(testDir, keepFile);
 const ignoreLogPath = path.join(testDir, ignoreLog);
 const ignoreTmpPath = path.join(testDir, ignoreTmp);
 
-const watcher = watch(testDir, {
-  ignore: [
-    '*.log',
-    /\.tmp$/,
-  ],
-});
+async function watchDir() {
+  const watcher = watch(testDir, {
+    ignore: [
+      '*.log',
+      /\.tmp$/,
+    ],
+  });
+
+  for await (const { filename } of watcher) {
+    assert.notStrictEqual(filename, ignoreLog);
+    assert.notStrictEqual(filename, ignoreTmp);
+
+    if (filename === keepFile) {
+      break;
+    }
+  }
+}
+
+async function writeFiles() {
+  if (common.isMacOS) {
+    // Do the write with a delay to ensure that the OS is ready to notify us.
+    // See https://github.com/nodejs/node/issues/52601.
+    await setTimeout(common.platformTimeout(100));
+  }
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
   writeFileSync(ignoreLogPath, 'ignored');
   writeFileSync(ignoreTmpPath, 'ignored');
   writeFileSync(keepFilePath, 'content');
-}, common.platformTimeout(100));
-
-for await (const { filename } of watcher) {
-  assert.notStrictEqual(filename, ignoreLog);
-  assert.notStrictEqual(filename, ignoreTmp);
-
-  if (filename === keepFile) {
-    break;
-  }
 }
+
+await Promise.all([watchDir(), writeFiles()]);

test/parallel/test-fs-promises-watch-ignore-regexp.mjs

@@ -3,12 +3,10 @@ import { skipIfNoWatch } from '../common/watch.js';
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = await import('node:assert');
 const path = await import('node:path');
 const tmpdir = await import('../common/tmpdir.js');
+const { setTimeout } = await import('node:timers/promises');
 const { watch } = await import('node:fs/promises');
 const { writeFileSync } = await import('node:fs');
 
@@ -20,19 +18,27 @@ const ignoreFile = 'ignore.tmp';
 const keepFilePath = path.join(testDir, keepFile);
 const ignoreFilePath = path.join(testDir, ignoreFile);
 
-const watcher = watch(testDir, { ignore: /\.tmp$/ });
+async function watchDir() {
+  const watcher = watch(testDir, { ignore: /\.tmp$/ });
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
-  writeFileSync(ignoreFilePath, 'ignored');
-  writeFileSync(keepFilePath, 'content');
-}, common.platformTimeout(100));
+  for await (const { filename } of watcher) {
+    assert.notStrictEqual(filename, ignoreFile);
 
-for await (const { filename } of watcher) {
-  assert.notStrictEqual(filename, ignoreFile);
+    if (filename === keepFile) {
+      break;
+    }
+  }
+}
 
-  if (filename === keepFile) {
-    break;
+async function writeFiles() {
+  if (common.isMacOS) {
+    // Do the write with a delay to ensure that the OS is ready to notify us.
+    // See https://github.com/nodejs/node/issues/52601.
+    await setTimeout(common.platformTimeout(100));
   }
+
+  writeFileSync(ignoreFilePath, 'ignored');
+  writeFileSync(keepFilePath, 'content');
 }
+
+await Promise.all([watchDir(), writeFiles()]);

test/parallel/test-fs-watch-ignore-function.js

@@ -5,9 +5,6 @@ const { skipIfNoWatch } = require('../common/watch.js');
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
@@ -33,9 +30,15 @@ watcher.on('change', common.mustCallAtLeast((event, filename) => {
   }
 }, 1));
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
+function writeFiles() {
   fs.writeFileSync(ignoredFilePath, 'ignored');
   fs.writeFileSync(testFilePath, 'content');
-}, common.platformTimeout(100));
+}
+
+if (common.isMacOS) {
+  // Do the write with a delay to ensure that the OS is ready to notify us. See
+  // https://github.com/nodejs/node/issues/52601.
+  setTimeout(writeFiles, common.platformTimeout(100));
+} else {
+  writeFiles();
+}

test/parallel/test-fs-watch-ignore-glob.js

@@ -5,9 +5,6 @@ const { skipIfNoWatch } = require('../common/watch.js');
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
@@ -33,9 +30,15 @@ watcher.on('change', common.mustCallAtLeast((event, filename) => {
   }
 }, 1));
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
+function writeFiles() {
   fs.writeFileSync(ignoredFilePath, 'ignored');
   fs.writeFileSync(testFilePath, 'content');
-}, common.platformTimeout(100));
+}
+
+if (common.isMacOS) {
+  // Do the write with a delay to ensure that the OS is ready to notify us. See
+  // https://github.com/nodejs/node/issues/52601.
+  setTimeout(writeFiles, common.platformTimeout(100));
+} else {
+  writeFiles();
+}

test/parallel/test-fs-watch-ignore-mixed.js

@@ -5,9 +5,6 @@ const { skipIfNoWatch } = require('../common/watch.js');
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
@@ -43,11 +40,17 @@ watcher.on('change', common.mustCallAtLeast((event, filename) => {
   }
 }, 1));
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
+function writeFiles() {
   fs.writeFileSync(ignoredLogPath, 'ignored');
   fs.writeFileSync(ignoredTmpPath, 'ignored');
   fs.writeFileSync(ignoredHiddenPath, 'ignored');
   fs.writeFileSync(testFilePath, 'content');
-}, common.platformTimeout(100));
+}
+
+if (common.isMacOS) {
+  // Do the write with a delay to ensure that the OS is ready to notify us. See
+  // https://github.com/nodejs/node/issues/52601.
+  setTimeout(writeFiles, common.platformTimeout(100));
+} else {
+  writeFiles();
+}

test/parallel/test-fs-watch-ignore-recursive-glob-subdirectories.js

@@ -5,9 +5,6 @@ const { skipIfNoWatch } = require('../common/watch.js');
 
 skipIfNoWatch();
 
-// if (common.isSunOS)
-//   common.skip('`fs.watch()` is not reliable on SunOS.');
-
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
@@ -45,9 +42,15 @@ watcher.on('change', common.mustCallAtLeast((event, filename) => {
   }
 }, 1));
 
-// Do the write with a delay to ensure that the OS is ready to notify us. See
-// https://github.com/nodejs/node/issues/52601.
-setTimeout(() => {
+function writeFiles() {
   fs.writeFileSync(ignoredFilePath, '{}');
   fs.writeFileSync(testFilePath, 'console.log("hello-' + Date.now() + '")');
-}, common.platformTimeout(100));
+}
+
+if (common.isMacOS) {
+  // Do the write with a delay to ensure that the OS is ready to notify us. See
+  // https://github.com/nodejs/node/issues/52601.
+  setTimeout(writeFiles, common.platformTimeout(100));
+} else {
+  writeFiles();
+}