Skip to content

Commit 750cca2

Browse files
LiviaMedeirosRafaelGSS
LiviaMedeiros
authored and
RafaelGSS
committed
test: use tmpdir.resolve()
PR-URL: #49128 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
1 parent 6595367 commit 750cca2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+119
-151
lines changed

‎test/parallel/test-common.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const tmpdir = require('../common/tmpdir');
2727
const assert = require('assert');
2828
const { execFile } = require('child_process');
2929
const { writeFileSync, existsSync } = require('fs');
30-
const { join } = require('path');
3130

3231
// Test for leaked global detection
3332
{
@@ -134,7 +133,7 @@ const HIJACK_TEST_ARRAY = [ 'foo\n', 'bar\n', 'baz\n' ];
134133
{
135134
tmpdir.refresh();
136135
assert.match(tmpdir.path, /\.tmp\.\d+/);
137-
const sentinelPath = join(tmpdir.path, 'gaga');
136+
const sentinelPath = tmpdir.resolve('gaga');
138137
writeFileSync(sentinelPath, 'googoo');
139138
tmpdir.refresh();
140139
assert.strictEqual(existsSync(tmpdir.path), true);

‎test/parallel/test-debugger-heap-profiler.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ common.skipIfInspectorDisabled();
66
const fixtures = require('../common/fixtures');
77
const startCLI = require('../common/debugger');
88
const tmpdir = require('../common/tmpdir');
9-
const path = require('path');
109

1110
tmpdir.refresh();
1211

1312
const { readFileSync } = require('fs');
1413

15-
const filename = path.join(tmpdir.path, 'node.heapsnapshot');
14+
const filename = tmpdir.resolve('node.heapsnapshot');
1615

1716
// Heap profiler take snapshot.
1817
{

‎test/parallel/test-file-write-stream.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
const common = require('../common');
2424
const assert = require('assert');
2525

26-
const path = require('path');
2726
const fs = require('fs');
2827
const tmpdir = require('../common/tmpdir');
29-
const fn = path.join(tmpdir.path, 'write.txt');
28+
const fn = tmpdir.resolve('write.txt');
3029
tmpdir.refresh();
3130
const file = fs.createWriteStream(fn, {
3231
highWaterMark: 10

‎test/parallel/test-file-write-stream2.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
require('../common');
2424
const assert = require('assert');
2525

26-
const path = require('path');
2726
const fs = require('fs');
2827

2928
const tmpdir = require('../common/tmpdir');
3029

3130

32-
const filepath = path.join(tmpdir.path, 'write.txt');
31+
const filepath = tmpdir.resolve('write.txt');
3332

3433
const EXPECTED = '012345678910';
3534

‎test/parallel/test-file-write-stream3.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const path = require('path');
2625
const fs = require('fs');
2726

2827
const tmpdir = require('../common/tmpdir');
2928

3029

31-
const filepath = path.join(tmpdir.path, 'write_pos.txt');
30+
const filepath = tmpdir.resolve('write_pos.txt');
3231

3332

3433
const cb_expected = 'write open close write open close write open close ';

‎test/parallel/test-file-write-stream4.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
// Refs: https://github.com/nodejs/node/issues/31366
55

66
const common = require('../common');
7-
const path = require('path');
87
const fs = require('fs');
98

109
const tmpdir = require('../common/tmpdir');
1110
tmpdir.refresh();
1211

13-
const filepath = path.join(tmpdir.path, 'write_pos.txt');
12+
const filepath = tmpdir.resolve('write_pos.txt');
1413

1514
const fileReadStream = fs.createReadStream(process.execPath);
1615
const fileWriteStream = fs.createWriteStream(filepath, {

‎test/parallel/test-heap-prof-dir-absolute.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ common.skipIfInspectorDisabled();
99

1010
const assert = require('assert');
1111
const fs = require('fs');
12-
const path = require('path');
1312
const { spawnSync } = require('child_process');
1413

1514
const tmpdir = require('../common/tmpdir');
@@ -24,7 +23,7 @@ const {
2423
// Tests absolute --heap-prof-dir
2524
{
2625
tmpdir.refresh();
27-
const dir = path.join(tmpdir.path, 'prof');
26+
const dir = tmpdir.resolve('prof');
2827
const output = spawnSync(process.execPath, [
2928
'--heap-prof',
3029
'--heap-prof-dir',

‎test/parallel/test-heap-prof-dir-name.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const {
2323

2424
{
2525
tmpdir.refresh();
26-
const dir = path.join(tmpdir.path, 'prof');
26+
const dir = tmpdir.resolve('prof');
2727
const file = path.join(dir, 'test.heapprofile');
2828
const output = spawnSync(process.execPath, [
2929
'--heap-prof',

‎test/parallel/test-heap-prof-dir-relative.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ common.skipIfInspectorDisabled();
99

1010
const assert = require('assert');
1111
const fs = require('fs');
12-
const path = require('path');
1312
const { spawnSync } = require('child_process');
1413

1514
const tmpdir = require('../common/tmpdir');
@@ -38,7 +37,7 @@ const {
3837
console.log(output.stderr.toString());
3938
}
4039
assert.strictEqual(output.status, 0);
41-
const dir = path.join(tmpdir.path, 'prof');
40+
const dir = tmpdir.resolve('prof');
4241
assert(fs.existsSync(dir));
4342
const profiles = getHeapProfiles(dir);
4443
assert.strictEqual(profiles.length, 1);

‎test/parallel/test-heap-prof-interval.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ common.skipIfInspectorDisabled();
99

1010
const assert = require('assert');
1111
const fs = require('fs');
12-
const path = require('path');
1312
const { spawnSync } = require('child_process');
1413

1514
const tmpdir = require('../common/tmpdir');
@@ -38,7 +37,7 @@ const {
3837
console.log(output.stderr.toString());
3938
}
4039
assert.strictEqual(output.status, 0);
41-
const dir = path.join(tmpdir.path, 'prof');
40+
const dir = tmpdir.resolve('prof');
4241
assert(fs.existsSync(dir));
4342
const profiles = getHeapProfiles(dir);
4443
assert.strictEqual(profiles.length, 2);

‎test/parallel/test-heap-prof-name.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const fixtures = require('../common/fixtures');
88
common.skipIfInspectorDisabled();
99

1010
const assert = require('assert');
11-
const path = require('path');
1211
const { spawnSync } = require('child_process');
1312

1413
const tmpdir = require('../common/tmpdir');
@@ -22,7 +21,7 @@ const {
2221

2322
{
2423
tmpdir.refresh();
25-
const file = path.join(tmpdir.path, 'test.heapprofile');
24+
const file = tmpdir.resolve('test.heapprofile');
2625
const output = spawnSync(process.execPath, [
2726
'--heap-prof',
2827
'--heap-prof-name',

‎test/parallel/test-internal-fs-syncwritestream.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
const common = require('../common');
55
const assert = require('assert');
66
const fs = require('fs');
7-
const path = require('path');
87
const SyncWriteStream = require('internal/fs/sync_write_stream');
98

109
const tmpdir = require('../common/tmpdir');
1110
tmpdir.refresh();
1211

13-
const filename = path.join(tmpdir.path, 'sync-write-stream.txt');
12+
const filename = tmpdir.resolve('sync-write-stream.txt');
1413

1514
// Verify constructing the instance with default options.
1615
{

‎test/parallel/test-macos-app-sandbox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const nodeBinary = process.execPath;
1717

1818
tmpdir.refresh();
1919

20-
const appBundlePath = path.join(tmpdir.path, 'node_sandboxed.app');
20+
const appBundlePath = tmpdir.resolve('node_sandboxed.app');
2121
const appBundleContentPath = path.join(appBundlePath, 'Contents');
2222
const appExecutablePath = path.join(
2323
appBundleContentPath, 'MacOS', 'node');

‎test/parallel/test-module-cache.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
require('../common');
33
const assert = require('assert');
44
const fs = require('fs');
5-
const path = require('path');
65
const tmpdir = require('../common/tmpdir');
76
tmpdir.refresh();
87

9-
const filePath = path.join(tmpdir.path, 'test-module-cache.json');
8+
const filePath = tmpdir.resolve('test-module-cache.json');
109
assert.throws(
1110
() => require(filePath),
1211
{ code: 'MODULE_NOT_FOUND' }

‎test/parallel/test-module-loading-globalpaths.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if (process.argv[2] === 'child') {
1818
tmpdir.refresh();
1919

2020
// Copy node binary into a test $PREFIX directory.
21-
const prefixPath = path.join(tmpdir.path, 'install');
21+
const prefixPath = tmpdir.resolve('install');
2222
fs.mkdirSync(prefixPath);
2323
let testExecPath;
2424
if (common.isWindows) {
@@ -46,7 +46,7 @@ if (process.argv[2] === 'child') {
4646
delete env.NODE_PATH;
4747

4848
// Test empty global path.
49-
const noPkgHomeDir = path.join(tmpdir.path, 'home-no-pkg');
49+
const noPkgHomeDir = tmpdir.resolve('home-no-pkg');
5050
fs.mkdirSync(noPkgHomeDir);
5151
env.HOME = env.USERPROFILE = noPkgHomeDir;
5252
assert.throws(

‎test/parallel/test-module-multi-extensions.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
const common = require('../common');
66
const assert = require('assert');
77
const fs = require('fs');
8-
const path = require('path');
98
const Module = require('module');
109
const tmpdir = require('../common/tmpdir');
11-
const file = path.join(tmpdir.path, 'test-extensions.foo.bar');
12-
const dotfile = path.join(tmpdir.path, '.bar');
13-
const dotfileWithExtension = path.join(tmpdir.path, '.foo.bar');
10+
const file = tmpdir.resolve('test-extensions.foo.bar');
11+
const dotfile = tmpdir.resolve('.bar');
12+
const dotfileWithExtension = tmpdir.resolve('.foo.bar');
1413

1514
tmpdir.refresh();
1615
fs.writeFileSync(file, 'console.log(__filename);', 'utf8');
@@ -20,7 +19,7 @@ fs.writeFileSync(dotfileWithExtension, 'console.log(__filename);', 'utf8');
2019
{
2120
require.extensions['.bar'] = common.mustNotCall();
2221
require.extensions['.foo.bar'] = common.mustCall();
23-
const modulePath = path.join(tmpdir.path, 'test-extensions');
22+
const modulePath = tmpdir.resolve('test-extensions');
2423
require(modulePath);
2524
require(file);
2625
delete require.cache[file];
@@ -31,7 +30,7 @@ fs.writeFileSync(dotfileWithExtension, 'console.log(__filename);', 'utf8');
3130

3231
{
3332
require.extensions['.foo.bar'] = common.mustCall();
34-
const modulePath = path.join(tmpdir.path, 'test-extensions');
33+
const modulePath = tmpdir.resolve('test-extensions');
3534
require(modulePath);
3635
assert.throws(
3736
() => require(`${modulePath}.foo`),
@@ -44,7 +43,7 @@ fs.writeFileSync(dotfileWithExtension, 'console.log(__filename);', 'utf8');
4443
}
4544

4645
{
47-
const modulePath = path.join(tmpdir.path, 'test-extensions');
46+
const modulePath = tmpdir.resolve('test-extensions');
4847
assert.throws(
4948
() => require(modulePath),
5049
(err) => err.message.startsWith(`Cannot find module '${modulePath}'`)
@@ -56,7 +55,7 @@ fs.writeFileSync(dotfileWithExtension, 'console.log(__filename);', 'utf8');
5655
{
5756
require.extensions['.bar'] = common.mustNotCall();
5857
require.extensions['.foo.bar'] = common.mustCall();
59-
const modulePath = path.join(tmpdir.path, 'test-extensions.foo');
58+
const modulePath = tmpdir.resolve('test-extensions.foo');
6059
require(modulePath);
6160
delete require.cache[file];
6261
delete require.extensions['.bar'];
@@ -66,7 +65,7 @@ fs.writeFileSync(dotfileWithExtension, 'console.log(__filename);', 'utf8');
6665

6766
{
6867
require.extensions['.foo.bar'] = common.mustNotCall();
69-
const modulePath = path.join(tmpdir.path, 'test-extensions.foo');
68+
const modulePath = tmpdir.resolve('test-extensions.foo');
7069
assert.throws(
7170
() => require(modulePath),
7271
(err) => err.message.startsWith(`Cannot find module '${modulePath}'`)

‎test/parallel/test-module-readonly.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const tmpdir = require('../common/tmpdir');
1616
tmpdir.refresh();
1717

1818
// Create readOnlyMod.js and set to read only
19-
const readOnlyMod = path.join(tmpdir.path, 'readOnlyMod');
19+
const readOnlyMod = tmpdir.resolve('readOnlyMod');
2020
const readOnlyModRelative = path.relative(__dirname, readOnlyMod);
2121
const readOnlyModFullPath = `${readOnlyMod}.js`;
2222

‎test/parallel/test-module-stat.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ const Module = require('module');
77
const fs = require('fs');
88
const tmpdir = require('../common/tmpdir');
99
const { ok, strictEqual } = require('assert');
10-
const { join } = require('path');
1110

12-
const directory = join(tmpdir.path, 'directory');
13-
const doesNotExist = join(tmpdir.path, 'does-not-exist');
14-
const file = join(tmpdir.path, 'file.js');
11+
const directory = tmpdir.resolve('directory');
12+
const doesNotExist = tmpdir.resolve('does-not-exist');
13+
const file = tmpdir.resolve('file.js');
1514

1615
tmpdir.refresh();
1716
fs.writeFileSync(file, "module.exports = { a: 'b' }");

‎test/parallel/test-npm-install.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ const fixtures = require('../common/fixtures');
1111

1212
const tmpdir = require('../common/tmpdir');
1313
tmpdir.refresh();
14-
const npmSandbox = path.join(tmpdir.path, 'npm-sandbox');
14+
const npmSandbox = tmpdir.resolve('npm-sandbox');
1515
fs.mkdirSync(npmSandbox);
16-
const homeDir = path.join(tmpdir.path, 'home');
16+
const homeDir = tmpdir.resolve('home');
1717
fs.mkdirSync(homeDir);
18-
const installDir = path.join(tmpdir.path, 'install-dir');
18+
const installDir = tmpdir.resolve('install-dir');
1919
fs.mkdirSync(installDir);
2020

2121
const npmPath = path.join(

‎test/parallel/test-permission-fs-symlink-target-write.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const { spawnSync } = require('child_process');
1919
tmpdir.refresh();
2020
}
2121

22-
const readOnlyFolder = path.join(tmpdir.path, 'read-only');
23-
const readWriteFolder = path.join(tmpdir.path, 'read-write');
24-
const writeOnlyFolder = path.join(tmpdir.path, 'write-only');
22+
const readOnlyFolder = tmpdir.resolve('read-only');
23+
const readWriteFolder = tmpdir.resolve('read-write');
24+
const writeOnlyFolder = tmpdir.resolve('write-only');
2525
const file = fixtures.path('permission', 'fs-symlink-target-write.js');
2626
const commonPathWildcard = path.join(__filename, '../../common*');
2727

‎test/parallel/test-permission-fs-symlink.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ const tmpdir = require('../common/tmpdir');
1919
const file = fixtures.path('permission', 'fs-symlink.js');
2020
const commonPathWildcard = path.join(__filename, '../../common*');
2121
const blockedFile = fixtures.path('permission', 'deny', 'protected-file.md');
22-
const blockedFolder = path.join(tmpdir.path, 'subdirectory');
23-
const symlinkFromBlockedFile = path.join(tmpdir.path, 'example-symlink.md');
22+
const blockedFolder = tmpdir.resolve('subdirectory');
23+
const symlinkFromBlockedFile = tmpdir.resolve('example-symlink.md');
2424

2525
{
2626
tmpdir.refresh();

‎test/parallel/test-permission-fs-traversal-path.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const tmpdir = require('../common/tmpdir');
1818

1919
const file = fixtures.path('permission', 'fs-traversal.js');
2020
const blockedFolder = tmpdir.path;
21-
const allowedFolder = path.join(tmpdir.path, 'subdirectory/');
21+
const allowedFolder = tmpdir.resolve('subdirectory/');
2222
const commonPathWildcard = path.join(__filename, '../../common*');
2323

2424
{

‎test/parallel/test-pipe-file-to-http.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ const common = require('../common');
2424
const assert = require('assert');
2525
const fs = require('fs');
2626
const http = require('http');
27-
const path = require('path');
2827

2928
const tmpdir = require('../common/tmpdir');
3029
tmpdir.refresh();
3130

32-
const filename = path.join(tmpdir.path, 'big');
31+
const filename = tmpdir.resolve('big');
3332
let count = 0;
3433

3534
const server = http.createServer((req, res) => {

‎test/parallel/test-policy-parse-integrity.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function hash(algo, body) {
2020
return h.digest('base64');
2121
}
2222

23-
const tmpdirPath = path.join(tmpdir.path, 'test-policy-parse-integrity');
23+
const tmpdirPath = tmpdir.resolve('test-policy-parse-integrity');
2424
fs.rmSync(tmpdirPath, { maxRetries: 3, recursive: true, force: true });
2525
fs.mkdirSync(tmpdirPath, { recursive: true });
2626

‎test/parallel/test-preload-print-process-argv.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@ require('../common');
77

88
const tmpdir = require('../common/tmpdir');
99
const assert = require('assert');
10-
const { join } = require('path');
1110
const { spawnSync } = require('child_process');
1211
const fs = require('fs');
1312

1413
tmpdir.refresh();
1514

1615
fs.writeFileSync(
17-
join(tmpdir.path, 'preload.js'),
16+
tmpdir.resolve('preload.js'),
1817
'console.log(JSON.stringify(process.argv));',
1918
'utf-8');
2019

2120
fs.writeFileSync(
22-
join(tmpdir.path, 'main.js'),
21+
tmpdir.resolve('main.js'),
2322
'console.log(JSON.stringify(process.argv));',
2423
'utf-8');
2524

0 commit comments

Comments
 (0)