nodejs · nodejs-github-bot · Aug 21, 2023 · Aug 13, 2023
diff --git a/test/addons/symlinked-module/test.js b/test/addons/symlinked-module/test.js
@@ -16,7 +16,7 @@ const tmpdir = require('../../common/tmpdir');
 tmpdir.refresh();
 
 const addonPath = path.join(__dirname, 'build', common.buildType);
-const addonLink = path.join(tmpdir.path, 'addon');
+const addonLink = tmpdir.resolve('addon');
 
 try {
   fs.symlinkSync(addonPath, addonLink, 'dir');

diff --git a/test/async-hooks/test-statwatcher.js b/test/async-hooks/test-statwatcher.js
@@ -6,15 +6,14 @@ const assert = require('assert');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 const fs = require('fs');
-const path = require('path');
 
 if (!common.isMainThread)
   common.skip('Worker bootstrapping works differently -> different async IDs');
 
 tmpdir.refresh();
 
-const file1 = path.join(tmpdir.path, 'file1');
-const file2 = path.join(tmpdir.path, 'file2');
+const file1 = tmpdir.resolve('file1');
+const file2 = tmpdir.resolve('file2');
 
 const onchangex = (x) => (curr, prev) => {
   console.log(`Watcher: ${x}`);

diff --git a/test/common/snapshot.js b/test/common/snapshot.js
@@ -2,14 +2,13 @@
 
 const tmpdir = require('../common/tmpdir');
 const { spawnSync } = require('child_process');
-const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
 
 function buildSnapshot(entry, env) {
   const child = spawnSync(process.execPath, [
     '--snapshot-blob',
-    path.join(tmpdir.path, 'snapshot.blob'),
+    tmpdir.resolve('snapshot.blob'),
     '--build-snapshot',
     entry,
   ], {
@@ -29,14 +28,14 @@ function buildSnapshot(entry, env) {
 
   assert.strictEqual(child.status, 0);
 
-  const stats = fs.statSync(path.join(tmpdir.path, 'snapshot.blob'));
+  const stats = fs.statSync(tmpdir.resolve('snapshot.blob'));
   assert(stats.isFile());
 
   return { child, stderr, stdout };
 }
 
 function runWithSnapshot(entry, env) {
-  const args = ['--snapshot-blob', path.join(tmpdir.path, 'snapshot.blob')];
+  const args = ['--snapshot-blob', tmpdir.resolve('snapshot.blob')];
   if (entry !== undefined) {
     args.push(entry);
   }

diff --git a/test/doctool/test-apilinks.mjs b/test/doctool/test-apilinks.mjs
@@ -19,7 +19,7 @@ fs.readdirSync(apilinks).forEach((fixture) => {
   const input = path.join(apilinks, fixture);
 
   const expectedContent = fs.readFileSync(`${input}on`, 'utf8');
-  const outputPath = path.join(tmpdir.path, `${fixture}on`);
+  const outputPath = tmpdir.resolve(`${fixture}on`);
   execFileSync(
     process.execPath,
     [script, outputPath, input],

diff --git a/test/doctool/test-doctool-versions.mjs b/test/doctool/test-doctool-versions.mjs
@@ -4,7 +4,6 @@ import tmpdir from '../common/tmpdir.js';
 import assert from 'assert';
 import { spawnSync } from 'child_process';
 import fs from 'fs';
-import path from 'path';
 import { fileURLToPath } from 'url';
 import util from 'util';
 
@@ -29,7 +28,7 @@ const expected = [
 ];
 
 tmpdir.refresh();
-const versionsFile = path.join(tmpdir.path, 'versions.json');
+const versionsFile = tmpdir.resolve('versions.json');
 debuglog(`${process.execPath} ${versionsTool} ${versionsFile}`);
 const opts = { cwd: tmpdir.path, encoding: 'utf8' };
 const cp = spawnSync(process.execPath, [ versionsTool, versionsFile ], opts);

diff --git a/test/embedding/test-embedding.js b/test/embedding/test-embedding.js
@@ -63,7 +63,7 @@ function getReadFileCodeForPath(path) {
 for (const extraSnapshotArgs of [[], ['--embedder-snapshot-as-file']]) {
   // readSync + eval since snapshots don't support userland require() (yet)
   const snapshotFixture = fixtures.path('snapshot', 'echo-args.js');
-  const blobPath = path.join(tmpdir.path, 'embedder-snapshot.blob');
+  const blobPath = tmpdir.resolve('embedder-snapshot.blob');
   const buildSnapshotArgs = [
     `eval(${getReadFileCodeForPath(snapshotFixture)})`, 'arg1', 'arg2',
     '--embedder-snapshot-blob', blobPath, '--embedder-snapshot-create',
@@ -94,7 +94,7 @@ for (const extraSnapshotArgs of [[], ['--embedder-snapshot-as-file']]) {
 // Create workers and vm contexts after deserialization
 {
   const snapshotFixture = fixtures.path('snapshot', 'create-worker-and-vm.js');
-  const blobPath = path.join(tmpdir.path, 'embedder-snapshot.blob');
+  const blobPath = tmpdir.resolve('embedder-snapshot.blob');
   const buildSnapshotArgs = [
     `eval(${getReadFileCodeForPath(snapshotFixture)})`,
     '--embedder-snapshot-blob', blobPath, '--embedder-snapshot-create',

diff --git a/test/es-module/test-esm-extension-lookup-deprecation.mjs b/test/es-module/test-esm-extension-lookup-deprecation.mjs
@@ -11,7 +11,7 @@ describe('ESM in main field', { concurrency: true }, () => {
   before(() => tmpdir.refresh());
 
   it('should handle fully-specified relative path without any warning', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');
@@ -29,7 +29,7 @@ describe('ESM in main field', { concurrency: true }, () => {
     assert.strictEqual(code, 0);
   });
   it('should handle fully-specified absolute path without any warning', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');
@@ -48,7 +48,7 @@ describe('ESM in main field', { concurrency: true }, () => {
   });
 
   it('should emit warning when "main" and "exports" are missing', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');
@@ -65,7 +65,7 @@ describe('ESM in main field', { concurrency: true }, () => {
     assert.strictEqual(code, 0);
   });
   it('should emit warning when "main" is falsy', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');
@@ -83,7 +83,7 @@ describe('ESM in main field', { concurrency: true }, () => {
     assert.strictEqual(code, 0);
   });
   it('should emit warning when "main" is a relative path without extension', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');
@@ -101,7 +101,7 @@ describe('ESM in main field', { concurrency: true }, () => {
     assert.strictEqual(code, 0);
   });
   it('should emit warning when "main" is an absolute path without extension', async () => {
-    const cwd = path.join(tmpdir.path, Math.random().toString());
+    const cwd = tmpdir.resolve(Math.random().toString());
     const pkgPath = path.join(cwd, './node_modules/pkg/');
     await mkdir(pkgPath, { recursive: true });
     await writeFile(path.join(pkgPath, './index.js'), 'console.log("Hello World!")');

diff --git a/test/es-module/test-esm-resolve-type.mjs b/test/es-module/test-esm-resolve-type.mjs
@@ -26,7 +26,7 @@ const {
   defaultResolve: resolve
 } = internalResolve;
 
-const rel = (file) => path.join(tmpdir.path, file);
+const rel = (file) => tmpdir.resolve(file);
 const previousCwd = process.cwd();
 const nmDir = rel('node_modules');
 

diff --git a/test/es-module/test-esm-symlink-main.js b/test/es-module/test-esm-symlink-main.js
@@ -9,7 +9,7 @@ const fs = require('fs');
 tmpdir.refresh();
 
 const realPath = path.resolve(__dirname, '../fixtures/es-modules/symlink.mjs');
-const symlinkPath = path.resolve(tmpdir.path, 'symlink.mjs');
+const symlinkPath = tmpdir.resolve('symlink.mjs');
 
 try {
   fs.symlinkSync(realPath, symlinkPath);

diff --git a/test/es-module/test-esm-windows.js b/test/es-module/test-esm-windows.js
@@ -15,7 +15,7 @@ const imp = (file) => {
 
 (async () => {
   tmpdir.refresh();
-  const rel = (file) => path.join(tmpdir.path, file);
+  const rel = (file) => tmpdir.resolve(file);
 
   { // Load a single script
     const file = rel('con.mjs');

diff --git a/test/fixtures/test-runner/concurrency/a.mjs b/test/fixtures/test-runner/concurrency/a.mjs
@@ -3,9 +3,9 @@ import { setTimeout } from 'node:timers/promises';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-await fs.writeFile(path.resolve(tmpdir.path, 'test-runner-concurrency'), 'a.mjs');
+await fs.writeFile(tmpdir.resolve('test-runner-concurrency'), 'a.mjs');
 while (true) {
-  const file = await fs.readFile(path.resolve(tmpdir.path, 'test-runner-concurrency'), 'utf8');
+  const file = await fs.readFile(tmpdir.resolve('test-runner-concurrency'), 'utf8');
   if (file === 'b.mjs') {
     break;
   }

diff --git a/test/fixtures/test-runner/concurrency/b.mjs b/test/fixtures/test-runner/concurrency/b.mjs
@@ -4,9 +4,9 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 while (true) {
-  const file = await fs.readFile(path.resolve(tmpdir.path, 'test-runner-concurrency'), 'utf8');
+  const file = await fs.readFile(tmpdir.resolve('test-runner-concurrency'), 'utf8');
   if (file === 'a.mjs') {
-    await fs.writeFile(path.resolve(tmpdir.path, 'test-runner-concurrency'), 'b.mjs');
+    await fs.writeFile(tmpdir.resolve('test-runner-concurrency'), 'b.mjs');
     break;
   }
   await setTimeout(10);

diff --git a/test/fixtures/watch-mode/ipc.js b/test/fixtures/watch-mode/ipc.js
@@ -3,7 +3,7 @@ const url = require('node:url');
 const fs = require('node:fs');
 const tmpdir = require('../../common/tmpdir');
 
-const tmpfile = path.join(tmpdir.path, 'file');
+const tmpfile = tmpdir.resolve('file');
 fs.writeFileSync(tmpfile, '');
 
 process.send({ 'watch:require': [path.resolve(__filename)] });

diff --git a/test/internet/test-corepack-yarn-install.js b/test/internet/test-corepack-yarn-install.js
@@ -11,11 +11,11 @@ const fixtures = require('../common/fixtures');
 
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
-const npmSandbox = path.join(tmpdir.path, 'npm-sandbox');
+const npmSandbox = tmpdir.resolve('npm-sandbox');
 fs.mkdirSync(npmSandbox);
-const homeDir = path.join(tmpdir.path, 'home');
+const homeDir = tmpdir.resolve('home');
 fs.mkdirSync(homeDir);
-const installDir = path.join(tmpdir.path, 'install-dir');
+const installDir = tmpdir.resolve('install-dir');
 fs.mkdirSync(installDir);
 
 const corepackYarnPath = path.join(

diff --git a/test/internet/test-trace-events-dns.js b/test/internet/test-trace-events-dns.js
@@ -2,7 +2,6 @@
 const common = require('../common');
 const assert = require('assert');
 const cp = require('child_process');
-const path = require('path');
 const tmpdir = require('../common/tmpdir');
 const fs = require('fs');
 const util = require('util');
@@ -57,7 +56,7 @@ for (const tr in tests) {
     throw new Error(`${tr}:\n${util.inspect(proc)}`);
   }
 
-  const file = path.join(tmpdir.path, traceFile);
+  const file = tmpdir.resolve(traceFile);
 
   const data = fs.readFileSync(file);
   const traces = JSON.parse(data.toString()).traceEvents

diff --git a/test/node-api/test_general/test.js b/test/node-api/test_general/test.js
@@ -19,7 +19,7 @@ tmpdir.refresh();
 }
 
 {
-  const urlTestDir = path.join(tmpdir.path, 'foo%#bar');
+  const urlTestDir = tmpdir.resolve('foo%#bar');
   const urlTestFile = path.join(urlTestDir, path.basename(filename));
   fs.mkdirSync(urlTestDir, { recursive: true });
   fs.copyFileSync(filename, urlTestFile);

diff --git a/test/node-api/test_policy/test_policy.js b/test/node-api/test_policy/test_policy.js
@@ -8,7 +8,6 @@ const tmpdir = require('../../common/tmpdir');
 const { spawnSync } = require('child_process');
 const crypto = require('crypto');
 const fs = require('fs');
-const path = require('path');
 const { pathToFileURL } = require('url');
 
 tmpdir.refresh();
@@ -19,7 +18,7 @@ function hash(algo, body) {
   return h.digest('base64');
 }
 
-const policyFilepath = path.join(tmpdir.path, 'policy');
+const policyFilepath = tmpdir.resolve('policy');
 
 const depFilepath = require.resolve(`./build/${common.buildType}/binding.node`);
 const depURL = pathToFileURL(depFilepath);

diff --git a/test/pummel/test-fs-largefile.js b/test/pummel/test-fs-largefile.js
@@ -24,14 +24,13 @@ const common = require('../common');
 
 const assert = require('assert');
 const fs = require('fs');
-const path = require('path');
 
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 
 try {
 
-  const filepath = path.join(tmpdir.path, 'large.txt');
+  const filepath = tmpdir.resolve('large.txt');
   const fd = fs.openSync(filepath, 'w+');
   const offset = 5 * 1024 * 1024 * 1024; // 5GB
   const message = 'Large File';

diff --git a/test/pummel/test-fs-readfile-tostring-fail.js b/test/pummel/test-fs-readfile-tostring-fail.js
@@ -7,7 +7,6 @@ if (!common.enoughTestMem)
 
 const assert = require('assert');
 const fs = require('fs');
-const path = require('path');
 const cp = require('child_process');
 const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
 if (common.isAIX && (Number(cp.execSync('ulimit -f')) * 512) < kStringMaxLength)
@@ -20,7 +19,7 @@ if (!tmpdir.hasEnoughSpace(kStringMaxLength)) {
   common.skip(`Not enough space in ${tmpdir.path}`);
 }
 
-const file = path.join(tmpdir.path, 'toobig.txt');
+const file = tmpdir.resolve('toobig.txt');
 const stream = fs.createWriteStream(file, {
   flags: 'a',
 });

diff --git a/test/pummel/test-fs-watch-file-slow.js b/test/pummel/test-fs-watch-file-slow.js
@@ -22,13 +22,12 @@
 'use strict';
 require('../common');
 const assert = require('assert');
-const path = require('path');
 const fs = require('fs');
 
 const tmpdir = require('../common/tmpdir');
 
 tmpdir.refresh();
-const FILENAME = path.join(tmpdir.path, 'watch-me');
+const FILENAME = tmpdir.resolve('watch-me');
 const TIMEOUT = 1300;
 
 let nevents = 0;

diff --git a/test/pummel/test-policy-integrity-dep.js b/test/pummel/test-policy-integrity-dep.js
@@ -194,7 +194,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-parent-commonjs.js b/test/pummel/test-policy-integrity-parent-commonjs.js
@@ -194,7 +194,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-parent-module.js b/test/pummel/test-policy-integrity-parent-module.js
@@ -194,7 +194,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-parent-no-package-json.js b/test/pummel/test-policy-integrity-parent-no-package-json.js
@@ -194,7 +194,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-worker-commonjs.js b/test/pummel/test-policy-integrity-worker-commonjs.js
@@ -211,7 +211,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-worker-module.js b/test/pummel/test-policy-integrity-worker-module.js
@@ -211,7 +211,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-policy-integrity-worker-no-package-json.js b/test/pummel/test-policy-integrity-worker-no-package-json.js
@@ -211,7 +211,7 @@ function drainQueue() {
   assert.notStrictEqual(status, 0, 'Should not allow multiple policies');
 }
 {
-  const enoentFilepath = path.join(tmpdir.path, 'enoent');
+  const enoentFilepath = tmpdir.resolve('enoent');
   try {
     fs.unlinkSync(enoentFilepath);
   } catch {

diff --git a/test/pummel/test-watch-file.js b/test/pummel/test-watch-file.js
@@ -24,11 +24,10 @@
 require('../common');
 const assert = require('assert');
 const fs = require('fs');
-const path = require('path');
 const tmpdir = require('../common/tmpdir');
 
 tmpdir.refresh();
-const f = path.join(tmpdir.path, 'x.txt');
+const f = tmpdir.resolve('x.txt');
 fs.closeSync(fs.openSync(f, 'w'));
 
 let changes = 0;