fs: ignore unrelated events in watch tests

change assertions on test-fs-watch-recursive-add-* tests to only take into account change events that match the file
nodejs · Oct 30, 2024 · 38f4ed7 · 38f4ed7
1 parent 6dea41d
commit 38f4ed7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js b/test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js
@@ -40,9 +40,8 @@ const relativePath = path.join(file, path.basename(subfolderPath), childrenFile)
 const watcher = fs.watch(testDirectory, { recursive: true });
 let watcherClosed = false;
 watcher.on('change', function(event, filename) {
-  assert.strictEqual(event, 'rename');
-
   if (filename === relativePath) {
+    assert.strictEqual(event, 'rename');
     watcher.close();
     watcherClosed = true;
   }

diff --git a/test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js b/test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js
@@ -36,10 +36,9 @@ let watcherClosed = false;
 function doWatch() {
   const watcher = fs.watch(testDirectory, { recursive: true });
   watcher.on('change', function(event, filename) {
-    assert.strictEqual(event, 'rename');
-    assert.ok(filename === path.basename(filePath) || filename === childrenRelativePath);
-
     if (filename === childrenRelativePath) {
+      assert.strictEqual(event, 'rename');
+      assert.ok(filename === path.basename(filePath) || filename === childrenRelativePath);
       watcher.close();
       watcherClosed = true;
     }

diff --git a/test/parallel/test-fs-watch-recursive-add-file-with-url.js b/test/parallel/test-fs-watch-recursive-add-file-with-url.js
@@ -35,9 +35,8 @@ tmpdir.refresh();
   const watcher = fs.watch(url, { recursive: true });
   let watcherClosed = false;
   watcher.on('change', function(event, filename) {
-    assert.strictEqual(event, 'rename');
-
     if (filename === path.basename(filePath)) {
+      assert.strictEqual(event, 'rename');
       watcher.close();
       watcherClosed = true;
     }

diff --git a/test/parallel/test-fs-watch-recursive-add-file.js b/test/parallel/test-fs-watch-recursive-add-file.js
@@ -31,9 +31,8 @@ const testFile = path.join(testDirectory, 'file-1.txt');
 const watcher = fs.watch(testDirectory, { recursive: true });
 let watcherClosed = false;
 watcher.on('change', function(event, filename) {
-  assert.strictEqual(event, 'rename');
-
   if (filename === path.basename(testFile)) {
+    assert.strictEqual(event, 'rename');
     watcher.close();
     watcherClosed = true;
   }

diff --git a/test/parallel/test-fs-watch-recursive-add-folder.js b/test/parallel/test-fs-watch-recursive-add-folder.js
@@ -33,9 +33,8 @@ tmpdir.refresh();
   const watcher = fs.watch(testDirectory, { recursive: true });
   let watcherClosed = false;
   watcher.on('change', function(event, filename) {
-    assert.strictEqual(event, 'rename');
-
     if (filename === path.basename(testFile)) {
+      assert.strictEqual(event, 'rename');
       watcher.close();
       watcherClosed = true;
     }