Skip to content

Commit 6595367

Browse files
LiviaMedeirosRafaelGSS
authored andcommitted
test: use tmpdir.resolve()
Subsystems: blob, child_process, common, crypto, http, http2, readline, repl, snapshot, trace_events PR-URL: #49127 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Debadree Chatterjee <debadree333@gmail.com>
1 parent 661b055 commit 6595367

File tree

60 files changed

+92
-154
lines changed

Some content is hidden

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

60 files changed

+92
-154
lines changed

test/parallel/test-blob-file-backed.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ const {
1515
const {
1616
unlink
1717
} = require('fs/promises');
18-
const path = require('path');
1918
const { Blob } = require('buffer');
2019

2120
const tmpdir = require('../common/tmpdir');
22-
const testfile = path.join(tmpdir.path, 'test-file-backed-blob.txt');
23-
const testfile2 = path.join(tmpdir.path, 'test-file-backed-blob2.txt');
24-
const testfile3 = path.join(tmpdir.path, 'test-file-backed-blob3.txt');
21+
const testfile = tmpdir.resolve('test-file-backed-blob.txt');
22+
const testfile2 = tmpdir.resolve('test-file-backed-blob2.txt');
23+
const testfile3 = tmpdir.resolve('test-file-backed-blob3.txt');
2524
tmpdir.refresh();
2625

2726
const data = `${'a'.repeat(1000)}${'b'.repeat(2000)}`;

test/parallel/test-child-process-fork-exec-path.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ const common = require('../common');
2727
const tmpdir = require('../common/tmpdir');
2828
const { addLibraryPath } = require('../common/shared-lib-util');
2929
const assert = require('assert');
30-
const path = require('path');
3130
const fs = require('fs');
3231
const { fork } = require('child_process');
3332

3433
const msg = { test: 'this' };
3534
const nodePath = process.execPath;
36-
const copyPath = path.join(tmpdir.path, 'node-copy.exe');
35+
const copyPath = tmpdir.resolve('node-copy.exe');
3736

3837
addLibraryPath(process.env);
3938

test/parallel/test-child-process-pipe-dataflow.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22
const common = require('../common');
33
const assert = require('assert');
4-
const path = require('path');
54
const fs = require('fs');
65
const spawn = require('child_process').spawn;
76
const tmpdir = require('../common/tmpdir');
@@ -18,7 +17,7 @@ const MB = KB * KB;
1817

1918
{
2019
tmpdir.refresh();
21-
const file = path.resolve(tmpdir.path, 'data.txt');
20+
const file = tmpdir.resolve('data.txt');
2221
const buf = Buffer.alloc(MB).fill('x');
2322

2423
// Most OS commands that deal with data, attach special meanings to new line -

test/parallel/test-crypto-authenticated-stream.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ if (!common.hasCrypto)
77
const assert = require('assert');
88
const crypto = require('crypto');
99
const fs = require('fs');
10-
const path = require('path');
1110
const stream = require('stream');
1211
const tmpdir = require('../common/tmpdir');
1312

@@ -72,7 +71,7 @@ function mstream(config) {
7271

7372
function fstream(config) {
7473
const count = fstream.count++;
75-
const filename = (name) => path.join(tmpdir.path, `${name}${count}`);
74+
const filename = (name) => tmpdir.resolve(`${name}${count}`);
7675

7776
const { cipher, key, iv, aad, authTagLength, plaintextLength } = config;
7877
const expected = Buffer.alloc(plaintextLength);

test/parallel/test-crypto-sign-verify.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ if (!common.hasCrypto)
55

66
const assert = require('assert');
77
const fs = require('fs');
8-
const path = require('path');
98
const exec = require('child_process').exec;
109
const crypto = require('crypto');
1110
const fixtures = require('../common/fixtures');
@@ -617,9 +616,9 @@ assert.throws(
617616
const tmpdir = require('../common/tmpdir');
618617
tmpdir.refresh();
619618

620-
const sigfile = path.join(tmpdir.path, 's5.sig');
619+
const sigfile = tmpdir.resolve('s5.sig');
621620
fs.writeFileSync(sigfile, s5);
622-
const msgfile = path.join(tmpdir.path, 's5.msg');
621+
const msgfile = tmpdir.resolve('s5.msg');
623622
fs.writeFileSync(msgfile, msg);
624623

625624
const cmd =

test/parallel/test-http-agent-getname.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require('../common');
44
const assert = require('assert');
55
const http = require('http');
6-
const path = require('path');
76

87
const tmpdir = require('../common/tmpdir');
98

@@ -41,7 +40,7 @@ assert.strictEqual(
4140
);
4241

4342
// unix socket
44-
const socketPath = path.join(tmpdir.path, 'foo', 'bar');
43+
const socketPath = tmpdir.resolve('foo', 'bar');
4544
assert.strictEqual(
4645
agent.getName({
4746
socketPath

test/parallel/test-http-chunk-problem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const cp = require('child_process');
3939

4040
const tmpdir = require('../common/tmpdir');
4141

42-
const filename = require('path').join(tmpdir.path, 'big');
42+
const filename = tmpdir.resolve('big');
4343
let server;
4444

4545
function executeRequest(cb) {

test/parallel/test-http-pipe-fs.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
const common = require('../common');
2424
const http = require('http');
2525
const fs = require('fs');
26-
const path = require('path');
2726
const Countdown = require('../common/countdown');
2827
const NUMBER_OF_STREAMS = 2;
2928

@@ -32,7 +31,7 @@ const countdown = new Countdown(NUMBER_OF_STREAMS, () => server.close());
3231
const tmpdir = require('../common/tmpdir');
3332
tmpdir.refresh();
3433

35-
const file = path.join(tmpdir.path, 'http-pipe-fs-test.txt');
34+
const file = tmpdir.resolve('http-pipe-fs-test.txt');
3635

3736
const server = http.createServer(common.mustCall(function(req, res) {
3837
const stream = fs.createWriteStream(file);

test/parallel/test-http2-compat-serverrequest-pipe.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ const fixtures = require('../common/fixtures');
77
const assert = require('assert');
88
const http2 = require('http2');
99
const fs = require('fs');
10-
const path = require('path');
1110

1211
// Piping should work as expected with createWriteStream
1312

1413
const tmpdir = require('../common/tmpdir');
1514
tmpdir.refresh();
1615
const loc = fixtures.path('person-large.jpg');
17-
const fn = path.join(tmpdir.path, 'http2-url-tests.js');
16+
const fn = tmpdir.resolve('http2-url-tests.js');
1817

1918
const server = http2.createServer();
2019

test/parallel/test-http2-pipe-named-pipe.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ const assert = require('assert');
88
const http2 = require('http2');
99
const fs = require('fs');
1010
const net = require('net');
11-
const path = require('path');
1211

1312
// HTTP/2 servers can listen on a named pipe.
1413

1514
const tmpdir = require('../common/tmpdir');
1615
tmpdir.refresh();
1716
const loc = fixtures.path('person-large.jpg');
18-
const fn = path.join(tmpdir.path, 'person-large.jpg');
17+
const fn = tmpdir.resolve('person-large.jpg');
1918

2019
const server = http2.createServer();
2120

test/parallel/test-http2-pipe.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ const fixtures = require('../common/fixtures');
77
const assert = require('assert');
88
const http2 = require('http2');
99
const fs = require('fs');
10-
const path = require('path');
1110

1211
// Piping should work as expected with createWriteStream
1312

1413
const tmpdir = require('../common/tmpdir');
1514
tmpdir.refresh();
1615
const loc = fixtures.path('person-large.jpg');
17-
const fn = path.join(tmpdir.path, 'http2-url-tests.js');
16+
const fn = tmpdir.resolve('http2-url-tests.js');
1817

1918
const server = http2.createServer();
2019

test/parallel/test-http2-respond-file-error-pipe-offset.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ if (!common.hasCrypto)
66
if (common.isWindows)
77
common.skip('no mkfifo on Windows');
88
const child_process = require('child_process');
9-
const path = require('path');
109
const fs = require('fs');
1110
const http2 = require('http2');
1211
const assert = require('assert');
1312

1413
const tmpdir = require('../common/tmpdir');
1514
tmpdir.refresh();
1615

17-
const pipeName = path.join(tmpdir.path, 'pipe');
16+
const pipeName = tmpdir.resolve('pipe');
1817

1918
const mkfifo = child_process.spawnSync('mkfifo', [ pipeName ]);
2019
if (mkfifo.error && mkfifo.error.code === 'ENOENT') {

test/parallel/test-http2-respond-file-with-pipe.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ if (!common.hasCrypto)
66
if (common.isWindows)
77
common.skip('no mkfifo on Windows');
88
const child_process = require('child_process');
9-
const path = require('path');
109
const fs = require('fs');
1110
const http2 = require('http2');
1211
const assert = require('assert');
1312

1413
const tmpdir = require('../common/tmpdir');
1514
tmpdir.refresh();
1615

17-
const pipeName = path.join(tmpdir.path, 'pipe');
16+
const pipeName = tmpdir.resolve('pipe');
1817

1918
const mkfifo = child_process.spawnSync('mkfifo', [ pipeName ]);
2019
if (mkfifo.error && mkfifo.error.code === 'ENOENT') {

test/parallel/test-readline-async-iterators-destroy.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
const common = require('../common');
44
const fs = require('fs');
55
const { once } = require('events');
6-
const { join } = require('path');
76
const readline = require('readline');
87
const assert = require('assert');
98

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

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

1514
const testContents = [
1615
'',

test/parallel/test-readline-async-iterators.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
const common = require('../common');
44
const fs = require('fs');
5-
const { join } = require('path');
65
const readline = require('readline');
76
const { Readable } = require('stream');
87
const assert = require('assert');
98

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

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

1514
const testContents = [
1615
'',

test/parallel/test-repl-autocomplete.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const stream = require('stream');
77
const REPL = require('internal/repl');
88
const assert = require('assert');
99
const fs = require('fs');
10-
const path = require('path');
1110
const { inspect } = require('util');
1211

1312
common.skipIfDumbTerminal();
@@ -17,7 +16,7 @@ tmpdir.refresh();
1716

1817
process.throwDeprecation = true;
1918

20-
const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
19+
const defaultHistoryPath = tmpdir.resolve('.node_repl_history');
2120

2221
// Create an input stream specialized for testing an array of actions
2322
class ActionStream extends stream.Stream {

test/parallel/test-repl-history-navigation.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const stream = require('stream');
77
const REPL = require('internal/repl');
88
const assert = require('assert');
99
const fs = require('fs');
10-
const path = require('path');
1110
const { inspect } = require('util');
1211

1312
common.skipIfDumbTerminal();
@@ -18,7 +17,7 @@ tmpdir.refresh();
1817
process.throwDeprecation = true;
1918
process.on('warning', common.mustNotCall());
2019

21-
const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
20+
const defaultHistoryPath = tmpdir.resolve('.node_repl_history');
2221

2322
// Create an input stream specialized for testing an array of actions
2423
class ActionStream extends stream.Stream {

test/parallel/test-repl-history-perm.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ if (common.isWindows) {
1313
}
1414

1515
const assert = require('assert');
16-
const path = require('path');
1716
const fs = require('fs');
1817
const repl = require('internal/repl');
1918
const Duplex = require('stream').Duplex;
@@ -33,7 +32,7 @@ stream.readable = stream.writable = true;
3332

3433
const tmpdir = require('../common/tmpdir');
3534
tmpdir.refresh();
36-
const replHistoryPath = path.join(tmpdir.path, '.node_repl_history');
35+
const replHistoryPath = tmpdir.resolve('.node_repl_history');
3736

3837
const checkResults = common.mustSucceed((r) => {
3938
const stat = fs.statSync(replHistoryPath);

test/parallel/test-repl-persistent-history.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const stream = require('stream');
88
const REPL = require('internal/repl');
99
const assert = require('assert');
1010
const fs = require('fs');
11-
const path = require('path');
1211
const os = require('os');
1312
const util = require('util');
1413

@@ -60,12 +59,11 @@ const CLEAR = { ctrl: true, name: 'u' };
6059

6160
// File paths
6261
const historyFixturePath = fixtures.path('.node_repl_history');
63-
const historyPath = path.join(tmpdir.path, '.fixture_copy_repl_history');
62+
const historyPath = tmpdir.resolve('.fixture_copy_repl_history');
6463
const historyPathFail = fixtures.path('nonexistent_folder', 'filename');
65-
const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
64+
const defaultHistoryPath = tmpdir.resolve('.node_repl_history');
6665
const emptyHiddenHistoryPath = fixtures.path('.empty-hidden-repl-history-file');
67-
const devNullHistoryPath = path.join(tmpdir.path,
68-
'.dev-null-repl-history-file');
66+
const devNullHistoryPath = tmpdir.resolve('.dev-null-repl-history-file');
6967
// Common message bits
7068
const prompt = '> ';
7169
const replDisabled = '\nPersistent history support disabled. Set the ' +

test/parallel/test-repl-programmatic-history.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const stream = require('stream');
66
const REPL = require('repl');
77
const assert = require('assert');
88
const fs = require('fs');
9-
const path = require('path');
109
const os = require('os');
1110
const util = require('util');
1211

@@ -58,12 +57,11 @@ const CLEAR = { ctrl: true, name: 'u' };
5857

5958
// File paths
6059
const historyFixturePath = fixtures.path('.node_repl_history');
61-
const historyPath = path.join(tmpdir.path, '.fixture_copy_repl_history');
60+
const historyPath = tmpdir.resolve('.fixture_copy_repl_history');
6261
const historyPathFail = fixtures.path('nonexistent_folder', 'filename');
63-
const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
62+
const defaultHistoryPath = tmpdir.resolve('.node_repl_history');
6463
const emptyHiddenHistoryPath = fixtures.path('.empty-hidden-repl-history-file');
65-
const devNullHistoryPath = path.join(tmpdir.path,
66-
'.dev-null-repl-history-file');
64+
const devNullHistoryPath = tmpdir.resolve('.dev-null-repl-history-file');
6765
// Common message bits
6866
const prompt = '> ';
6967
const replDisabled = '\nPersistent history support disabled. Set the ' +

test/parallel/test-repl-require-after-write.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ const common = require('../common');
44
const tmpdir = require('../common/tmpdir');
55
const assert = require('assert');
66
const spawn = require('child_process').spawn;
7-
const path = require('path');
87

98
tmpdir.refresh();
109

11-
const requirePath = JSON.stringify(path.join(tmpdir.path, 'non-existent.json'));
10+
const requirePath = JSON.stringify(tmpdir.resolve('non-existent.json'));
1211

1312
// Use -i to force node into interactive mode, despite stdout not being a TTY
1413
const child = spawn(process.execPath, ['-i']);

test/parallel/test-repl-reverse-search.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const stream = require('stream');
77
const REPL = require('internal/repl');
88
const assert = require('assert');
99
const fs = require('fs');
10-
const path = require('path');
1110
const { inspect } = require('util');
1211

1312
common.skipIfDumbTerminal();
@@ -16,7 +15,7 @@ common.allowGlobals('aaaa');
1615
const tmpdir = require('../common/tmpdir');
1716
tmpdir.refresh();
1817

19-
const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
18+
const defaultHistoryPath = tmpdir.resolve('.node_repl_history');
2019

2120
// Create an input stream specialized for testing an array of actions
2221
class ActionStream extends stream.Stream {

0 commit comments

Comments
 (0)