diff --git a/test/test-runner/test-run-watch-cwd-isolation-none-argv.mjs b/test/test-runner/test-run-watch-cwd-isolation-none-argv.mjs index 1066f8fc5d6c..4abed7c44381 100644 --- a/test/test-runner/test-run-watch-cwd-isolation-none-argv.mjs +++ b/test/test-runner/test-run-watch-cwd-isolation-none-argv.mjs @@ -2,25 +2,17 @@ // parent process argv when spawning the watch child. import * as common from '../common/index.mjs'; import assert from 'node:assert'; -import { writeFileSync } from 'node:fs'; -import { join } from 'node:path'; import { run } from 'node:test'; -import tmpdir from '../common/tmpdir.js'; +import fixtures from '../common/fixtures.js'; import { skipIfNoWatch } from '../common/watch.js'; skipIfNoWatch(); -tmpdir.refresh(); - -writeFileSync(join(tmpdir.path, 'test.js'), ` -const test = require('node:test'); - -test('test ran from cwd', () => {}); -`); const passed = []; const controller = new AbortController(); const stream = run({ - cwd: tmpdir.path, + // Avoid delayed file creation notifications triggering a watch restart. + cwd: fixtures.path('test-runner-watch'), watch: true, signal: controller.signal, isolation: 'none', @@ -38,4 +30,4 @@ stream.on('test:pass', common.mustCall((data) => passed.push(data.name), 1)); for await (const _ of stream); // Validate the expected test ran by name: -assert.deepStrictEqual(passed, ['test ran from cwd']); +assert.deepStrictEqual(passed, ['test has ran']); diff --git a/test/test-runner/test-run-watch-cwd-isolation-none.mjs b/test/test-runner/test-run-watch-cwd-isolation-none.mjs index ce65bfb5e416..4d745212c571 100644 --- a/test/test-runner/test-run-watch-cwd-isolation-none.mjs +++ b/test/test-runner/test-run-watch-cwd-isolation-none.mjs @@ -1,15 +1,15 @@ // Test run({ watch: true, cwd, isolation: 'none' }) runs with different cwd while in watch mode and isolation none import * as common from '../common/index.mjs'; import { run } from 'node:test'; -import tmpdir from '../common/tmpdir.js'; -import { refreshForTestRunnerWatch, skipIfNoWatch } from '../common/watch.js'; +import fixtures from '../common/fixtures.js'; +import { skipIfNoWatch } from '../common/watch.js'; skipIfNoWatch(); -refreshForTestRunnerWatch(); const controller = new AbortController(); const stream = run({ - cwd: tmpdir.path, + // Avoid delayed file creation notifications triggering a watch restart. + cwd: fixtures.path('test-runner-watch'), watch: true, signal: controller.signal, isolation: 'none', diff --git a/test/test-runner/test-runner.status b/test/test-runner/test-runner.status index a568b797c2f4..65ae96eb9e37 100644 --- a/test/test-runner/test-runner.status +++ b/test/test-runner/test-runner.status @@ -5,8 +5,3 @@ prefix test-runner # sample-test : PASS,FLAKY [true] # This section applies to all platforms - -[$system==macos && $arch==x64] -# https://github.com/nodejs/node/issues/54534#issuecomment-5423551021 -test-run-watch-cwd-isolation-none: PASS, FLAKY -test-run-watch-cwd-isolation-none-argv: PASS, FLAKY