test_runner: handle file rename and deletion under watch mode

Fixes: #53113
nodejs · May 24, 2024 · d23cbc4 · d23cbc4
1 parent 1b96527
commit d23cbc4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -3,6 +3,7 @@ const {
   ArrayIsArray,
   ArrayPrototypeEvery,
   ArrayPrototypeFilter,
+  ArrayPrototypeFind,
   ArrayPrototypeForEach,
   ArrayPrototypeIncludes,
   ArrayPrototypeJoin,
@@ -418,7 +419,22 @@ function watchFiles(testFiles, opts) {
   const filesWatcher = { __proto__: null, watcher, runningProcesses, runningSubtests };
   opts.root.harness.watching = true;
 
-  watcher.on('changed', ({ owners }) => {
+  watcher.on('changed', ({ owners, eventType }) => {
+    if (eventType === 'rename') {
+      const updatedTestFiles = createTestFileList();
+
+      const newFileName = ArrayPrototypeFind(updatedTestFiles, (x) => !ArrayPrototypeIncludes(testFiles, x));
+      const previousFileName = ArrayPrototypeFind(testFiles, (x) => !ArrayPrototypeIncludes(updatedTestFiles, x));
+
+      // When file renamed
+      if (newFileName && previousFileName) {
+        owners = new SafeSet().add(newFileName);
+        watcher.filterFile(resolve(newFileName), owners);
+      }
+
+      testFiles = updatedTestFiles;
+    }
+
     watcher.unfilterFilesOwnedBy(owners);
     PromisePrototypeThen(SafePromiseAllReturnVoid(testFiles, async (file) => {
       if (!owners.has(file)) {

diff --git a/lib/internal/watch_mode/files_watcher.js b/lib/internal/watch_mode/files_watcher.js
@@ -80,7 +80,7 @@ class FilesWatcher extends EventEmitter {
     watcher.handle.close();
   }
 
-  #onChange(trigger) {
+  #onChange(trigger, eventType) {
     if (this.#mode === 'filter' && !this.#filteredFiles.has(trigger)) {
       return;
     }
@@ -93,7 +93,7 @@ class FilesWatcher extends EventEmitter {
     clearTimeout(this.#debounceTimer);
     this.#debounceTimer = setTimeout(() => {
       this.#debounceTimer = null;
-      this.emit('changed', { owners: this.#debounceOwners });
+      this.emit('changed', { owners: this.#debounceOwners, eventType });
       this.#debounceOwners.clear();
     }, this.#debounce).unref();
   }
@@ -110,7 +110,7 @@ class FilesWatcher extends EventEmitter {
     watcher.on('change', (eventType, fileName) => {
       // `fileName` can be `null` if it cannot be determined. See
       // https://github.com/nodejs/node/pull/49891#issuecomment-1744673430.
-      this.#onChange(recursive ? resolve(path, fileName ?? '') : path);
+      this.#onChange(recursive ? resolve(path, fileName ?? '') : path, eventType);
     });
     this.#watchers.set(path, { handle: watcher, recursive });
     if (recursive) {