From a7f4add192d447019314a43e146ff0c8735cfd17 Mon Sep 17 00:00:00 2001 From: LiviaMedeiros Date: Sun, 13 Aug 2023 13:24:21 +0800 Subject: [PATCH] test: use `tmpdir.resolve()` in fs tests --- ...-fs-promises-file-handle-aggregate-errors.js | 3 +-- ...test-fs-promises-file-handle-close-errors.js | 3 +-- .../test-fs-promises-file-handle-op-errors.js | 3 +-- .../test-fs-promises-file-handle-read-worker.js | 3 +-- .../test-fs-promises-file-handle-readLines.mjs | 3 +-- .../test-fs-promises-file-handle-stat.js | 3 +-- .../test-fs-promises-file-handle-sync.js | 3 +-- .../test-fs-promises-file-handle-truncate.js | 3 +-- .../test-fs-promises-readfile-with-fd.js | 3 +-- test/parallel/test-fs-promises-readfile.js | 3 +-- test/parallel/test-fs-promises-watch.js | 2 +- .../test-fs-promises-write-optional-params.js | 3 +-- .../test-fs-promises-writefile-with-fd.js | 3 +-- test/parallel/test-fs-read-stream-autoClose.js | 3 +-- test/parallel/test-fs-read-stream-fd.js | 3 +-- .../parallel/test-fs-read-stream-file-handle.js | 3 +-- test/parallel/test-fs-read-stream-pos.js | 3 +-- test/parallel/test-fs-readfile-fd.js | 3 +-- test/parallel/test-fs-readfile-flags.js | 7 +++---- test/parallel/test-fs-readfile-pipe-large.js | 3 +-- test/parallel/test-fs-readfile-unlink.js | 3 +-- test/parallel/test-fs-readfile.js | 13 ++++++------- .../parallel/test-fs-readfilesync-pipe-large.js | 3 +-- test/parallel/test-fs-readv-promises.js | 3 +-- test/parallel/test-fs-readv-sync.js | 3 +-- test/parallel/test-fs-readv.js | 3 +-- test/parallel/test-fs-ready-event-stream.js | 3 +-- test/parallel/test-fs-sir-writes-alot.js | 3 +-- test/parallel/test-fs-syncwritestream.js | 3 +-- test/parallel/test-fs-write-buffer-large.js | 3 +-- test/parallel/test-fs-write-buffer.js | 17 ++++++++--------- test/parallel/test-fs-write-file-buffer.js | 3 +-- .../parallel/test-fs-write-file-invalid-path.js | 5 ++--- test/parallel/test-fs-write-file-sync.js | 11 +++++------ test/parallel/test-fs-write-file-typedarrays.js | 3 +-- test/parallel/test-fs-write-file.js | 13 ++++++------- test/parallel/test-fs-write-negativeoffset.js | 8 ++------ test/parallel/test-fs-write-optional-params.js | 5 ++--- test/parallel/test-fs-write-reuse-callback.js | 3 +-- test/parallel/test-fs-write-sigxfsz.js | 3 +-- .../test-fs-write-stream-autoclose-option.js | 3 +-- .../test-fs-write-stream-change-open.js | 3 +-- ...st-fs-write-stream-close-without-callback.js | 3 +-- .../test-fs-write-stream-double-close.js | 7 +++---- test/parallel/test-fs-write-stream-encoding.js | 3 +-- test/parallel/test-fs-write-stream-end.js | 7 +++---- .../test-fs-write-stream-file-handle-2.js | 3 +-- .../test-fs-write-stream-file-handle.js | 3 +-- test/parallel/test-fs-write-stream-fs.js | 5 ++--- .../test-fs-write-stream-throw-type-error.js | 3 +-- test/parallel/test-fs-write-stream.js | 3 +-- .../test-fs-write-sync-optional-params.js | 3 +-- test/parallel/test-fs-write-sync.js | 3 +-- test/parallel/test-fs-write.js | 9 ++++----- test/parallel/test-fs-writefile-with-fd.js | 9 ++++----- test/parallel/test-fs-writev-promises.js | 3 +-- test/parallel/test-fs-writev-sync.js | 3 +-- test/parallel/test-fs-writev.js | 3 +-- 58 files changed, 95 insertions(+), 155 deletions(-) diff --git a/test/parallel/test-fs-promises-file-handle-aggregate-errors.js b/test/parallel/test-fs-promises-file-handle-aggregate-errors.js index d4c3b37d652d12..8e71ac98e6e8ae 100644 --- a/test/parallel/test-fs-promises-file-handle-aggregate-errors.js +++ b/test/parallel/test-fs-promises-file-handle-aggregate-errors.js @@ -7,7 +7,6 @@ const tmpdir = require('../common/tmpdir'); // The following tests validate aggregate errors are thrown correctly // when both an operation and close throw. -const path = require('path'); const { readFile, writeFile, @@ -23,7 +22,7 @@ const originalFd = Object.getOwnPropertyDescriptor(FileHandle.prototype, 'fd'); let count = 0; async function createFile() { - const filePath = path.join(tmpdir.path, `aggregate_errors_${++count}.txt`); + const filePath = tmpdir.resolve(`aggregate_errors_${++count}.txt`); await writeFile(filePath, 'content'); return filePath; } diff --git a/test/parallel/test-fs-promises-file-handle-close-errors.js b/test/parallel/test-fs-promises-file-handle-close-errors.js index b975b3f3e1583c..89bf53300560f6 100644 --- a/test/parallel/test-fs-promises-file-handle-close-errors.js +++ b/test/parallel/test-fs-promises-file-handle-close-errors.js @@ -7,7 +7,6 @@ const tmpdir = require('../common/tmpdir'); // The following tests validate aggregate errors are thrown correctly // when both an operation and close throw. -const path = require('path'); const { readFile, writeFile, @@ -23,7 +22,7 @@ const originalFd = Object.getOwnPropertyDescriptor(FileHandle.prototype, 'fd'); let count = 0; async function createFile() { - const filePath = path.join(tmpdir.path, `close_errors_${++count}.txt`); + const filePath = tmpdir.resolve(`close_errors_${++count}.txt`); await writeFile(filePath, 'content'); return filePath; } diff --git a/test/parallel/test-fs-promises-file-handle-op-errors.js b/test/parallel/test-fs-promises-file-handle-op-errors.js index 7110b5d9d40467..c869351985b6fa 100644 --- a/test/parallel/test-fs-promises-file-handle-op-errors.js +++ b/test/parallel/test-fs-promises-file-handle-op-errors.js @@ -7,7 +7,6 @@ const tmpdir = require('../common/tmpdir'); // The following tests validate aggregate errors are thrown correctly // when both an operation and close throw. -const path = require('path'); const { readFile, writeFile, @@ -23,7 +22,7 @@ const originalFd = Object.getOwnPropertyDescriptor(FileHandle.prototype, 'fd'); let count = 0; async function createFile() { - const filePath = path.join(tmpdir.path, `op_errors_${++count}.txt`); + const filePath = tmpdir.resolve(`op_errors_${++count}.txt`); await writeFile(filePath, 'content'); return filePath; } diff --git a/test/parallel/test-fs-promises-file-handle-read-worker.js b/test/parallel/test-fs-promises-file-handle-read-worker.js index b6f262223e2777..7ae881801ad0b1 100644 --- a/test/parallel/test-fs-promises-file-handle-read-worker.js +++ b/test/parallel/test-fs-promises-file-handle-read-worker.js @@ -2,9 +2,8 @@ const common = require('../common'); const fs = require('fs'); const assert = require('assert'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'read_stream_filehandle_worker.txt'); +const file = tmpdir.resolve('read_stream_filehandle_worker.txt'); const input = 'hello world'; const { Worker, isMainThread, workerData } = require('worker_threads'); diff --git a/test/parallel/test-fs-promises-file-handle-readLines.mjs b/test/parallel/test-fs-promises-file-handle-readLines.mjs index f6bcd147f8cf31..bd1577e23f076d 100644 --- a/test/parallel/test-fs-promises-file-handle-readLines.mjs +++ b/test/parallel/test-fs-promises-file-handle-readLines.mjs @@ -3,11 +3,10 @@ import tmpdir from '../common/tmpdir.js'; import assert from 'node:assert'; import { open, writeFile } from 'node:fs/promises'; -import path from 'node:path'; tmpdir.refresh(); -const filePath = path.join(tmpdir.path, 'file.txt'); +const filePath = tmpdir.resolve('file.txt'); await writeFile(filePath, '1\n\n2\n'); diff --git a/test/parallel/test-fs-promises-file-handle-stat.js b/test/parallel/test-fs-promises-file-handle-stat.js index 278d3700edc028..c989c405c5c74a 100644 --- a/test/parallel/test-fs-promises-file-handle-stat.js +++ b/test/parallel/test-fs-promises-file-handle-stat.js @@ -6,14 +6,13 @@ const common = require('../common'); // FileHandle.stat method. const { open } = require('fs').promises; -const path = require('path'); const tmpdir = require('../common/tmpdir'); const assert = require('assert'); tmpdir.refresh(); async function validateStat() { - const filePath = path.resolve(tmpdir.path, 'tmp-read-file.txt'); + const filePath = tmpdir.resolve('tmp-read-file.txt'); const fileHandle = await open(filePath, 'w+'); const stats = await fileHandle.stat(); assert.ok(stats.mtime instanceof Date); diff --git a/test/parallel/test-fs-promises-file-handle-sync.js b/test/parallel/test-fs-promises-file-handle-sync.js index 07cfe98e99a5fd..ac2f18e9bb2f9e 100644 --- a/test/parallel/test-fs-promises-file-handle-sync.js +++ b/test/parallel/test-fs-promises-file-handle-sync.js @@ -5,11 +5,10 @@ const fixtures = require('../common/fixtures'); const tmpdir = require('../common/tmpdir'); const { access, copyFile, open } = require('fs').promises; -const path = require('path'); async function validate() { tmpdir.refresh(); - const dest = path.resolve(tmpdir.path, 'baz.js'); + const dest = tmpdir.resolve('baz.js'); await assert.rejects( copyFile(fixtures.path('baz.js'), dest, 'r'), { diff --git a/test/parallel/test-fs-promises-file-handle-truncate.js b/test/parallel/test-fs-promises-file-handle-truncate.js index 13db8f03155dfc..687f8c27251d5d 100644 --- a/test/parallel/test-fs-promises-file-handle-truncate.js +++ b/test/parallel/test-fs-promises-file-handle-truncate.js @@ -2,7 +2,6 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const { open, readFile } = require('fs').promises; const tmpdir = require('../common/tmpdir'); @@ -10,7 +9,7 @@ tmpdir.refresh(); async function validateTruncate() { const text = 'Hello world'; - const filename = path.resolve(tmpdir.path, 'truncate-file.txt'); + const filename = tmpdir.resolve('truncate-file.txt'); const fileHandle = await open(filename, 'w+'); const buffer = Buffer.from(text, 'utf8'); diff --git a/test/parallel/test-fs-promises-readfile-with-fd.js b/test/parallel/test-fs-promises-readfile-with-fd.js index 999a0a4c94b941..b5d1c26168126e 100644 --- a/test/parallel/test-fs-promises-readfile-with-fd.js +++ b/test/parallel/test-fs-promises-readfile-with-fd.js @@ -5,14 +5,13 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const { writeFileSync } = require('fs'); const { open } = require('fs').promises; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const fn = path.join(tmpdir.path, 'test.txt'); +const fn = tmpdir.resolve('test.txt'); writeFileSync(fn, 'Hello World'); async function readFileTest() { diff --git a/test/parallel/test-fs-promises-readfile.js b/test/parallel/test-fs-promises-readfile.js index 8043223e591a2d..30305568f6e087 100644 --- a/test/parallel/test-fs-promises-readfile.js +++ b/test/parallel/test-fs-promises-readfile.js @@ -4,14 +4,13 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const { writeFile, readFile } = require('fs').promises; const tmpdir = require('../common/tmpdir'); const { internalBinding } = require('internal/test/binding'); const fsBinding = internalBinding('fs'); tmpdir.refresh(); -const fn = path.join(tmpdir.path, 'large-file'); +const fn = tmpdir.resolve('large-file'); // Creating large buffer with random content const largeBuffer = Buffer.from( diff --git a/test/parallel/test-fs-promises-watch.js b/test/parallel/test-fs-promises-watch.js index 055e798d0e49e4..780a0d2dfaaa1f 100644 --- a/test/parallel/test-fs-promises-watch.js +++ b/test/parallel/test-fs-promises-watch.js @@ -17,7 +17,7 @@ class WatchTestCase { this.field = field; this.shouldSkip = !shouldInclude; } - get dirPath() { return join(tmpdir.path, this.dirName); } + get dirPath() { return tmpdir.resolve(this.dirName); } get filePath() { return join(this.dirPath, this.fileName); } } diff --git a/test/parallel/test-fs-promises-write-optional-params.js b/test/parallel/test-fs-promises-write-optional-params.js index 4dd87155153769..739875cb2c49c5 100644 --- a/test/parallel/test-fs-promises-write-optional-params.js +++ b/test/parallel/test-fs-promises-write-optional-params.js @@ -7,12 +7,11 @@ const common = require('../common'); const assert = require('assert'); const fsPromises = require('fs').promises; -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const dest = path.resolve(tmpdir.path, 'tmp.txt'); +const dest = tmpdir.resolve('tmp.txt'); const buffer = Buffer.from('zyx'); async function testInvalid(dest, expectedCode, ...params) { diff --git a/test/parallel/test-fs-promises-writefile-with-fd.js b/test/parallel/test-fs-promises-writefile-with-fd.js index 12ba9954c2f1b2..7cb9eeeca9a9f2 100644 --- a/test/parallel/test-fs-promises-writefile-with-fd.js +++ b/test/parallel/test-fs-promises-writefile-with-fd.js @@ -5,14 +5,13 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const { readFileSync } = require('fs'); const { open } = require('fs').promises; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const fn = path.join(tmpdir.path, 'test.txt'); +const fn = tmpdir.resolve('test.txt'); async function writeFileTest() { const handle = await open(fn, 'w'); diff --git a/test/parallel/test-fs-read-stream-autoClose.js b/test/parallel/test-fs-read-stream-autoClose.js index e7989ee7911264..728d4f5eeef1ff 100644 --- a/test/parallel/test-fs-read-stream-autoClose.js +++ b/test/parallel/test-fs-read-stream-autoClose.js @@ -2,10 +2,9 @@ const common = require('../common'); const fs = require('fs'); -const path = require('path'); const assert = require('assert'); const tmpdir = require('../common/tmpdir'); -const writeFile = path.join(tmpdir.path, 'write-autoClose.txt'); +const writeFile = tmpdir.resolve('write-autoClose.txt'); tmpdir.refresh(); const file = fs.createWriteStream(writeFile, { autoClose: true }); diff --git a/test/parallel/test-fs-read-stream-fd.js b/test/parallel/test-fs-read-stream-fd.js index c28ab65140aa10..f40d35b9671206 100644 --- a/test/parallel/test-fs-read-stream-fd.js +++ b/test/parallel/test-fs-read-stream-fd.js @@ -23,9 +23,8 @@ const common = require('../common'); const fs = require('fs'); const assert = require('assert'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, '/read_stream_fd_test.txt'); +const file = tmpdir.resolve('read_stream_fd_test.txt'); const input = 'hello world'; let output = ''; diff --git a/test/parallel/test-fs-read-stream-file-handle.js b/test/parallel/test-fs-read-stream-file-handle.js index 810745149dc5bf..b7abb5df575569 100644 --- a/test/parallel/test-fs-read-stream-file-handle.js +++ b/test/parallel/test-fs-read-stream-file-handle.js @@ -2,9 +2,8 @@ const common = require('../common'); const fs = require('fs'); const assert = require('assert'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'read_stream_filehandle_test.txt'); +const file = tmpdir.resolve('read_stream_filehandle_test.txt'); const input = 'hello world'; tmpdir.refresh(); diff --git a/test/parallel/test-fs-read-stream-pos.js b/test/parallel/test-fs-read-stream-pos.js index c67c2e8a81fc47..7ce63a537ef251 100644 --- a/test/parallel/test-fs-read-stream-pos.js +++ b/test/parallel/test-fs-read-stream-pos.js @@ -6,11 +6,10 @@ const common = require('../common'); const tmpdir = require('../common/tmpdir'); const fs = require('fs'); const assert = require('assert'); -const path = require('path'); tmpdir.refresh(); -const file = path.join(tmpdir.path, '/read_stream_pos_test.txt'); +const file = tmpdir.resolve('read_stream_pos_test.txt'); fs.writeFileSync(file, ''); diff --git a/test/parallel/test-fs-readfile-fd.js b/test/parallel/test-fs-readfile-fd.js index 933b3c9748ed3c..1779d9f97dbd80 100644 --- a/test/parallel/test-fs-readfile-fd.js +++ b/test/parallel/test-fs-readfile-fd.js @@ -7,7 +7,6 @@ const fixtures = require('../common/fixtures'); const assert = require('assert'); const fs = require('fs'); const fn = fixtures.path('empty.txt'); -const join = require('path').join; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); @@ -55,7 +54,7 @@ function tempFdSync(callback) { // position of the file, instead of reading from the beginning of the file, // when used with file descriptors. - const filename = join(tmpdir.path, 'test.txt'); + const filename = tmpdir.resolve('test.txt'); fs.writeFileSync(filename, 'Hello World'); { diff --git a/test/parallel/test-fs-readfile-flags.js b/test/parallel/test-fs-readfile-flags.js index 62b97308042b3a..72b910aeeb48d6 100644 --- a/test/parallel/test-fs-readfile-flags.js +++ b/test/parallel/test-fs-readfile-flags.js @@ -4,13 +4,12 @@ const common = require('../common'); const fs = require('fs'); const assert = require('assert'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); { - const emptyFile = path.join(tmpdir.path, 'empty.txt'); + const emptyFile = tmpdir.resolve('empty.txt'); fs.closeSync(fs.openSync(emptyFile, 'w')); fs.readFile( @@ -29,7 +28,7 @@ tmpdir.refresh(); } { - const willBeCreated = path.join(tmpdir.path, 'will-be-created'); + const willBeCreated = tmpdir.resolve('will-be-created'); fs.readFile( willBeCreated, @@ -40,7 +39,7 @@ tmpdir.refresh(); } { - const willNotBeCreated = path.join(tmpdir.path, 'will-not-be-created'); + const willNotBeCreated = tmpdir.resolve('will-not-be-created'); fs.readFile( willNotBeCreated, diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js index 14a0793620b7b9..1a685ebc612b85 100644 --- a/test/parallel/test-fs-readfile-pipe-large.js +++ b/test/parallel/test-fs-readfile-pipe-large.js @@ -7,7 +7,6 @@ if (common.isWindows || common.isAIX) common.skip(`No /dev/stdin on ${process.platform}.`); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); if (process.argv[2] === 'child') { @@ -20,7 +19,7 @@ if (process.argv[2] === 'child') { const tmpdir = require('../common/tmpdir'); -const filename = path.join(tmpdir.path, '/readfile_pipe_large_test.txt'); +const filename = tmpdir.resolve('readfile_pipe_large_test.txt'); const dataExpected = 'a'.repeat(999999); tmpdir.refresh(); fs.writeFileSync(filename, dataExpected); diff --git a/test/parallel/test-fs-readfile-unlink.js b/test/parallel/test-fs-readfile-unlink.js index c3e70a7c4db597..1688567fd67acc 100644 --- a/test/parallel/test-fs-readfile-unlink.js +++ b/test/parallel/test-fs-readfile-unlink.js @@ -26,11 +26,10 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); -const fileName = path.resolve(tmpdir.path, 'test.bin'); +const fileName = tmpdir.resolve('test.bin'); const buf = Buffer.alloc(512 * 1024, 42); tmpdir.refresh(); diff --git a/test/parallel/test-fs-readfile.js b/test/parallel/test-fs-readfile.js index 999c22165278af..74731728676b1b 100644 --- a/test/parallel/test-fs-readfile.js +++ b/test/parallel/test-fs-readfile.js @@ -7,22 +7,21 @@ const common = require('../common'); const tmpdir = require('../../test/common/tmpdir'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const prefix = `.removeme-fs-readfile-${process.pid}`; tmpdir.refresh(); const fileInfo = [ - { name: path.join(tmpdir.path, `${prefix}-1K.txt`), + { name: tmpdir.resolve(`${prefix}-1K.txt`), len: 1024 }, - { name: path.join(tmpdir.path, `${prefix}-64K.txt`), + { name: tmpdir.resolve(`${prefix}-64K.txt`), len: 64 * 1024 }, - { name: path.join(tmpdir.path, `${prefix}-64KLessOne.txt`), + { name: tmpdir.resolve(`${prefix}-64KLessOne.txt`), len: (64 * 1024) - 1 }, - { name: path.join(tmpdir.path, `${prefix}-1M.txt`), + { name: tmpdir.resolve(`${prefix}-1M.txt`), len: 1 * 1024 * 1024 }, - { name: path.join(tmpdir.path, `${prefix}-1MPlusOne.txt`), + { name: tmpdir.resolve(`${prefix}-1MPlusOne.txt`), len: (1 * 1024 * 1024) + 1 }, ]; @@ -61,7 +60,7 @@ for (const e of fileInfo) { // truncateSync() will fail with ENOSPC if there is not enough space. common.printSkipMessage(`Not enough space in ${tmpdir.path}`); } else { - const file = path.join(tmpdir.path, `${prefix}-too-large.txt`); + const file = tmpdir.resolve(`${prefix}-too-large.txt`); fs.writeFileSync(file, Buffer.from('0')); fs.truncateSync(file, kIoMaxLength + 1); diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js index 7c2a5e7fd01ae3..2cb857a329fbee 100644 --- a/test/parallel/test-fs-readfilesync-pipe-large.js +++ b/test/parallel/test-fs-readfilesync-pipe-large.js @@ -7,7 +7,6 @@ if (common.isWindows || common.isAIX) common.skip(`No /dev/stdin on ${process.platform}.`); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); if (process.argv[2] === 'child') { @@ -17,7 +16,7 @@ if (process.argv[2] === 'child') { const tmpdir = require('../common/tmpdir'); -const filename = path.join(tmpdir.path, '/readfilesync_pipe_large_test.txt'); +const filename = tmpdir.resolve('readfilesync_pipe_large_test.txt'); const dataExpected = 'a'.repeat(999999); tmpdir.refresh(); fs.writeFileSync(filename, dataExpected); diff --git a/test/parallel/test-fs-readv-promises.js b/test/parallel/test-fs-readv-promises.js index 3d698f2536a7f2..cdfc3d3b21f918 100644 --- a/test/parallel/test-fs-readv-promises.js +++ b/test/parallel/test-fs-readv-promises.js @@ -1,7 +1,6 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs').promises; const tmpdir = require('../common/tmpdir'); @@ -12,7 +11,7 @@ const exptectedBuff = Buffer.from(expected); let cnt = 0; function getFileName() { - return path.join(tmpdir.path, `readv_promises_${++cnt}.txt`); + return tmpdir.resolve(`readv_promises_${++cnt}.txt`); } const allocateEmptyBuffers = (combinedLength) => { diff --git a/test/parallel/test-fs-readv-sync.js b/test/parallel/test-fs-readv-sync.js index 6a09de7466de5a..22f28c7830e746 100644 --- a/test/parallel/test-fs-readv-sync.js +++ b/test/parallel/test-fs-readv-sync.js @@ -3,7 +3,6 @@ require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); @@ -13,7 +12,7 @@ const expected = 'ümlaut. Лорем 運務ホソモ指及 आपको कर const exptectedBuff = Buffer.from(expected); const expectedLength = exptectedBuff.length; -const filename = path.join(tmpdir.path, 'readv_sync.txt'); +const filename = tmpdir.resolve('readv_sync.txt'); fs.writeFileSync(filename, exptectedBuff); const allocateEmptyBuffers = (combinedLength) => { diff --git a/test/parallel/test-fs-readv.js b/test/parallel/test-fs-readv.js index 2ca79b302c636f..aa24c3e06ba4de 100644 --- a/test/parallel/test-fs-readv.js +++ b/test/parallel/test-fs-readv.js @@ -2,7 +2,6 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); @@ -11,7 +10,7 @@ tmpdir.refresh(); const expected = 'ümlaut. Лорем 運務ホソモ指及 आपको करने विकास 紙読決多密所 أضف'; let cnt = 0; -const getFileName = () => path.join(tmpdir.path, `readv_${++cnt}.txt`); +const getFileName = () => tmpdir.resolve(`readv_${++cnt}.txt`); const exptectedBuff = Buffer.from(expected); const allocateEmptyBuffers = (combinedLength) => { diff --git a/test/parallel/test-fs-ready-event-stream.js b/test/parallel/test-fs-ready-event-stream.js index 68e8fb76b771f4..bf1ca0795a634c 100644 --- a/test/parallel/test-fs-ready-event-stream.js +++ b/test/parallel/test-fs-ready-event-stream.js @@ -2,7 +2,6 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); const readStream = fs.createReadStream(__filename); @@ -11,7 +10,7 @@ readStream.on('ready', common.mustCall(() => { assert.strictEqual(readStream.pending, false); })); -const writeFile = path.join(tmpdir.path, 'write-fsreadyevent.txt'); +const writeFile = tmpdir.resolve('write-fsreadyevent.txt'); tmpdir.refresh(); const writeStream = fs.createWriteStream(writeFile, { autoClose: true }); assert.strictEqual(writeStream.pending, true); diff --git a/test/parallel/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js index 5d8c3dfec90aab..7d213d6c6fc89b 100644 --- a/test/parallel/test-fs-sir-writes-alot.js +++ b/test/parallel/test-fs-sir-writes-alot.js @@ -23,11 +23,10 @@ require('../common'); const fs = require('fs'); const assert = require('assert'); -const join = require('path').join; const tmpdir = require('../common/tmpdir'); -const filename = join(tmpdir.path, 'out.txt'); +const filename = tmpdir.resolve('out.txt'); tmpdir.refresh(); diff --git a/test/parallel/test-fs-syncwritestream.js b/test/parallel/test-fs-syncwritestream.js index 35591876e849d4..799b4b73ee17ce 100644 --- a/test/parallel/test-fs-syncwritestream.js +++ b/test/parallel/test-fs-syncwritestream.js @@ -4,7 +4,6 @@ const assert = require('assert'); const spawn = require('child_process').spawn; const stream = require('stream'); const fs = require('fs'); -const path = require('path'); // require('internal/fs/utils').SyncWriteStream is used as a stdio // implementation when stdout/stderr point to files. @@ -24,7 +23,7 @@ if (process.argv[2] === 'child') { const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const filename = path.join(tmpdir.path, 'stdout'); +const filename = tmpdir.resolve('stdout'); const stdoutFd = fs.openSync(filename, 'w'); const proc = spawn(process.execPath, [__filename, 'child'], { diff --git a/test/parallel/test-fs-write-buffer-large.js b/test/parallel/test-fs-write-buffer-large.js index a80072354eaa0f..e1ae7cd467f7bc 100644 --- a/test/parallel/test-fs-write-buffer-large.js +++ b/test/parallel/test-fs-write-buffer-large.js @@ -1,7 +1,6 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); @@ -20,7 +19,7 @@ try { common.skip('skipped due to memory requirements'); } -const filename = path.join(tmpdir.path, 'write9.txt'); +const filename = tmpdir.resolve('write9.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { assert.throws(() => { fs.write(fd, diff --git a/test/parallel/test-fs-write-buffer.js b/test/parallel/test-fs-write-buffer.js index a70c44eaceffe5..c26064c7a188bc 100644 --- a/test/parallel/test-fs-write-buffer.js +++ b/test/parallel/test-fs-write-buffer.js @@ -22,7 +22,6 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const expected = Buffer.from('hello'); @@ -31,7 +30,7 @@ tmpdir.refresh(); // fs.write with all parameters provided: { - const filename = path.join(tmpdir.path, 'write1.txt'); + const filename = tmpdir.resolve('write1.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); @@ -47,7 +46,7 @@ tmpdir.refresh(); // fs.write with a buffer, without the length parameter: { - const filename = path.join(tmpdir.path, 'write2.txt'); + const filename = tmpdir.resolve('write2.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, 2); @@ -63,7 +62,7 @@ tmpdir.refresh(); // fs.write with a buffer, without the offset and length parameters: { - const filename = path.join(tmpdir.path, 'write3.txt'); + const filename = tmpdir.resolve('write3.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); @@ -79,7 +78,7 @@ tmpdir.refresh(); // fs.write with the offset passed as undefined followed by the callback: { - const filename = path.join(tmpdir.path, 'write4.txt'); + const filename = tmpdir.resolve('write4.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); @@ -95,7 +94,7 @@ tmpdir.refresh(); // fs.write with offset and length passed as undefined followed by the callback: { - const filename = path.join(tmpdir.path, 'write5.txt'); + const filename = tmpdir.resolve('write5.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); @@ -111,7 +110,7 @@ tmpdir.refresh(); // fs.write with a Uint8Array, without the offset and length parameters: { - const filename = path.join(tmpdir.path, 'write6.txt'); + const filename = tmpdir.resolve('write6.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); @@ -127,7 +126,7 @@ tmpdir.refresh(); // fs.write with invalid offset type { - const filename = path.join(tmpdir.path, 'write7.txt'); + const filename = tmpdir.resolve('write7.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { assert.throws(() => { fs.write(fd, @@ -149,7 +148,7 @@ tmpdir.refresh(); // fs.write with a DataView, without the offset and length parameters: { - const filename = path.join(tmpdir.path, 'write8.txt'); + const filename = tmpdir.resolve('write8.txt'); fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => { const cb = common.mustSucceed((written) => { assert.strictEqual(written, expected.length); diff --git a/test/parallel/test-fs-write-file-buffer.js b/test/parallel/test-fs-write-file-buffer.js index 82fb7ad69a443b..ec6c60e1a46971 100644 --- a/test/parallel/test-fs-write-file-buffer.js +++ b/test/parallel/test-fs-write-file-buffer.js @@ -21,7 +21,6 @@ 'use strict'; require('../common'); -const join = require('path').join; const util = require('util'); const fs = require('fs'); @@ -50,6 +49,6 @@ const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); const buf = Buffer.from(data, 'base64'); -fs.writeFileSync(join(tmpdir.path, 'test.jpg'), buf); +fs.writeFileSync(tmpdir.resolve('test.jpg'), buf); util.log('Done!'); diff --git a/test/parallel/test-fs-write-file-invalid-path.js b/test/parallel/test-fs-write-file-invalid-path.js index a4c8ff5bf73a03..aaa7eacde5c849 100644 --- a/test/parallel/test-fs-write-file-invalid-path.js +++ b/test/parallel/test-fs-write-file-invalid-path.js @@ -3,7 +3,6 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); if (!common.isWindows) common.skip('This test is for Windows only.'); @@ -18,7 +17,7 @@ const DATA_VALUE = 'hello'; const RESERVED_CHARACTERS = '<>"|?*'; [...RESERVED_CHARACTERS].forEach((ch) => { - const pathname = path.join(tmpdir.path, `somefile_${ch}`); + const pathname = tmpdir.resolve(`somefile_${ch}`); assert.throws( () => { fs.writeFileSync(pathname, DATA_VALUE); @@ -29,7 +28,7 @@ const RESERVED_CHARACTERS = '<>"|?*'; // Test for ':' (NTFS data streams). // Refs: https://msdn.microsoft.com/en-us/library/windows/desktop/bb540537.aspx -const pathname = path.join(tmpdir.path, 'foo:bar'); +const pathname = tmpdir.resolve('foo:bar'); fs.writeFileSync(pathname, DATA_VALUE); let content = ''; diff --git a/test/parallel/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js index 53a69a92564f1c..26aa819a8107f0 100644 --- a/test/parallel/test-fs-write-file-sync.js +++ b/test/parallel/test-fs-write-file-sync.js @@ -26,7 +26,6 @@ if (!common.isMainThread) common.skip('Setting process.umask is not supported in Workers'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); // On Windows chmod is only able to manipulate read-only bit. Test if creating @@ -41,7 +40,7 @@ tmpdir.refresh(); // Test writeFileSync { - const file = path.join(tmpdir.path, 'testWriteFileSync.txt'); + const file = tmpdir.resolve('testWriteFileSync.txt'); fs.writeFileSync(file, '123', { mode }); const content = fs.readFileSync(file, { encoding: 'utf8' }); @@ -51,7 +50,7 @@ tmpdir.refresh(); // Test appendFileSync { - const file = path.join(tmpdir.path, 'testAppendFileSync.txt'); + const file = tmpdir.resolve('testAppendFileSync.txt'); fs.appendFileSync(file, 'abc', { mode }); const content = fs.readFileSync(file, { encoding: 'utf8' }); @@ -77,7 +76,7 @@ tmpdir.refresh(); return _closeSync(...args); }; - const file = path.join(tmpdir.path, 'testWriteFileSyncFd.txt'); + const file = tmpdir.resolve('testWriteFileSyncFd.txt'); const fd = fs.openSync(file, 'w+', mode); fs.writeFileSync(fd, '123'); @@ -94,7 +93,7 @@ tmpdir.refresh(); // Test writeFileSync with flags { - const file = path.join(tmpdir.path, 'testWriteFileSyncFlags.txt'); + const file = tmpdir.resolve('testWriteFileSyncFlags.txt'); fs.writeFileSync(file, 'hello ', { encoding: 'utf8', flag: 'a' }); fs.writeFileSync(file, 'world!', { encoding: 'utf8', flag: 'a' }); @@ -104,7 +103,7 @@ tmpdir.refresh(); // Test writeFileSync with an invalid input { - const file = path.join(tmpdir.path, 'testWriteFileSyncInvalid.txt'); + const file = tmpdir.resolve('testWriteFileSyncInvalid.txt'); for (const data of [ false, 5, {}, [], null, undefined, true, 5n, () => {}, Symbol(), new Map(), new String('notPrimitive'), diff --git a/test/parallel/test-fs-write-file-typedarrays.js b/test/parallel/test-fs-write-file-typedarrays.js index 9b48bf9dbbafa1..e398579f123ab1 100644 --- a/test/parallel/test-fs-write-file-typedarrays.js +++ b/test/parallel/test-fs-write-file-typedarrays.js @@ -2,12 +2,11 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const join = require('path').join; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const filename = join(tmpdir.path, 'test.txt'); +const filename = tmpdir.resolve('test.txt'); const s = '南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、' + '广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。' + diff --git a/test/parallel/test-fs-write-file.js b/test/parallel/test-fs-write-file.js index 812b144875b8f6..404caa4636de04 100644 --- a/test/parallel/test-fs-write-file.js +++ b/test/parallel/test-fs-write-file.js @@ -23,12 +23,11 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const join = require('path').join; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const filename = join(tmpdir.path, 'test.txt'); +const filename = tmpdir.resolve('test.txt'); const s = '南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、' + '广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。' + @@ -45,7 +44,7 @@ fs.writeFile(filename, s, common.mustSucceed(() => { })); // Test that writeFile accepts buffers. -const filename2 = join(tmpdir.path, 'test2.txt'); +const filename2 = tmpdir.resolve('test2.txt'); const buf = Buffer.from(s, 'utf8'); fs.writeFile(filename2, buf, common.mustSucceed(() => { @@ -55,7 +54,7 @@ fs.writeFile(filename2, buf, common.mustSucceed(() => { })); // Test that writeFile accepts file descriptors. -const filename4 = join(tmpdir.path, 'test4.txt'); +const filename4 = tmpdir.resolve('test4.txt'); fs.open(filename4, 'w+', common.mustSucceed((fd) => { fs.writeFile(fd, s, common.mustSucceed(() => { @@ -73,7 +72,7 @@ fs.open(filename4, 'w+', common.mustSucceed((fd) => { // Before the operation has started const controller = new AbortController(); const signal = controller.signal; - const filename3 = join(tmpdir.path, 'test3.txt'); + const filename3 = tmpdir.resolve('test3.txt'); fs.writeFile(filename3, s, { signal }, common.mustCall((err) => { assert.strictEqual(err.name, 'AbortError'); @@ -87,7 +86,7 @@ fs.open(filename4, 'w+', common.mustSucceed((fd) => { // After the operation has started const controller = new AbortController(); const signal = controller.signal; - const filename4 = join(tmpdir.path, 'test5.txt'); + const filename4 = tmpdir.resolve('test5.txt'); fs.writeFile(filename4, s, { signal }, common.mustCall((err) => { assert.strictEqual(err.name, 'AbortError'); @@ -98,7 +97,7 @@ fs.open(filename4, 'w+', common.mustSucceed((fd) => { { // Test read-only mode - const filename = join(tmpdir.path, 'test6.txt'); + const filename = tmpdir.resolve('test6.txt'); fs.writeFileSync(filename, ''); fs.writeFile(filename, s, { flag: 'r' }, common.expectsError(/EBADF/)); } diff --git a/test/parallel/test-fs-write-negativeoffset.js b/test/parallel/test-fs-write-negativeoffset.js index b1c6ed9039b7d7..e347505a869349 100644 --- a/test/parallel/test-fs-write-negativeoffset.js +++ b/test/parallel/test-fs-write-negativeoffset.js @@ -4,10 +4,6 @@ const common = require('../common'); -const { - join, -} = require('path'); - const { closeSync, open, @@ -20,7 +16,7 @@ const assert = require('assert'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const filename = join(tmpdir.path, 'test.txt'); +const filename = tmpdir.resolve('test.txt'); open(filename, 'w+', common.mustSucceed((fd) => { assert.throws(() => { @@ -36,7 +32,7 @@ open(filename, 'w+', common.mustSucceed((fd) => { closeSync(fd); })); -const filename2 = join(tmpdir.path, 'test2.txt'); +const filename2 = tmpdir.resolve('test2.txt'); // Make sure negative length's don't cause aborts either diff --git a/test/parallel/test-fs-write-optional-params.js b/test/parallel/test-fs-write-optional-params.js index 6f61f5b41864a2..eebc1cc88c95b1 100644 --- a/test/parallel/test-fs-write-optional-params.js +++ b/test/parallel/test-fs-write-optional-params.js @@ -7,13 +7,12 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); const util = require('util'); tmpdir.refresh(); -const destInvalid = path.resolve(tmpdir.path, 'rwopt_invalid'); +const destInvalid = tmpdir.resolve('rwopt_invalid'); const buffer = Buffer.from('zyx'); function testInvalidCb(fd, expectedCode, buffer, options, callback) { @@ -28,7 +27,7 @@ function testValidCb(buffer, options, index, callback) { options = common.mustNotMutateObjectDeep(options); const length = options?.length; const offset = options?.offset; - const dest = path.resolve(tmpdir.path, `rwopt_valid_${index}`); + const dest = tmpdir.resolve(`rwopt_valid_${index}`); fs.open(dest, 'w', common.mustSucceed((fd) => { fs.write(fd, buffer, options, common.mustSucceed((bytesWritten, bufferWritten) => { const writeBufCopy = Uint8Array.prototype.slice.call(bufferWritten); diff --git a/test/parallel/test-fs-write-reuse-callback.js b/test/parallel/test-fs-write-reuse-callback.js index 790d719b67c46b..82c772ab340fed 100644 --- a/test/parallel/test-fs-write-reuse-callback.js +++ b/test/parallel/test-fs-write-reuse-callback.js @@ -3,7 +3,6 @@ const common = require('../common'); const tmpdir = require('../common/tmpdir'); const assert = require('assert'); -const path = require('path'); // Regression test for https://github.com/nodejs/node-v0.x-archive/issues/814: // Make sure that Buffers passed to fs.write() are not garbage-collected @@ -12,7 +11,7 @@ const path = require('path'); const fs = require('fs'); tmpdir.refresh(); -const filename = path.join(tmpdir.path, 'test.txt'); +const filename = tmpdir.resolve('test.txt'); const fd = fs.openSync(filename, 'w'); const size = 16 * 1024; diff --git a/test/parallel/test-fs-write-sigxfsz.js b/test/parallel/test-fs-write-sigxfsz.js index 323312fcb943dc..b746faeeb47214 100644 --- a/test/parallel/test-fs-write-sigxfsz.js +++ b/test/parallel/test-fs-write-sigxfsz.js @@ -7,7 +7,6 @@ const tmpdir = require('../common/tmpdir'); const assert = require('assert'); const child_process = require('child_process'); const fs = require('fs'); -const path = require('path'); if (common.isWindows) common.skip('no RLIMIT_FSIZE on Windows'); @@ -16,7 +15,7 @@ if (process.config.variables.node_shared) common.skip('SIGXFSZ signal handler not installed in shared library mode'); if (process.argv[2] === 'child') { - const filename = path.join(tmpdir.path, 'efbig.txt'); + const filename = tmpdir.resolve('efbig.txt'); tmpdir.refresh(); fs.writeFileSync(filename, '.'.repeat(1 << 16)); // Exceeds RLIMIT_FSIZE. } else { diff --git a/test/parallel/test-fs-write-stream-autoclose-option.js b/test/parallel/test-fs-write-stream-autoclose-option.js index 8d205fbc69fb39..fe738091bd6c68 100644 --- a/test/parallel/test-fs-write-stream-autoclose-option.js +++ b/test/parallel/test-fs-write-stream-autoclose-option.js @@ -1,12 +1,11 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'write-autoclose-opt1.txt'); +const file = tmpdir.resolve('write-autoclose-opt1.txt'); tmpdir.refresh(); let stream = fs.createWriteStream(file, { flags: 'w+', autoClose: false }); stream.write('Test1'); diff --git a/test/parallel/test-fs-write-stream-change-open.js b/test/parallel/test-fs-write-stream-change-open.js index 2fc06cf901615b..b95abb1cb34c95 100644 --- a/test/parallel/test-fs-write-stream-change-open.js +++ b/test/parallel/test-fs-write-stream-change-open.js @@ -22,12 +22,11 @@ 'use strict'; require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'write.txt'); +const file = tmpdir.resolve('write.txt'); tmpdir.refresh(); diff --git a/test/parallel/test-fs-write-stream-close-without-callback.js b/test/parallel/test-fs-write-stream-close-without-callback.js index b07c799efdb2d4..7bf83cd8096b5e 100644 --- a/test/parallel/test-fs-write-stream-close-without-callback.js +++ b/test/parallel/test-fs-write-stream-close-without-callback.js @@ -2,12 +2,11 @@ require('../common'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const s = fs.createWriteStream(path.join(tmpdir.path, 'nocallback')); +const s = fs.createWriteStream(tmpdir.resolve('nocallback')); s.end('hello world'); s.close(); diff --git a/test/parallel/test-fs-write-stream-double-close.js b/test/parallel/test-fs-write-stream-double-close.js index 28e53061f74c3b..336ceaee5044fa 100644 --- a/test/parallel/test-fs-write-stream-double-close.js +++ b/test/parallel/test-fs-write-stream-double-close.js @@ -3,20 +3,19 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); { - const s = fs.createWriteStream(path.join(tmpdir.path, 'rw')); + const s = fs.createWriteStream(tmpdir.resolve('rw')); s.close(common.mustCall()); s.close(common.mustCall()); } { - const s = fs.createWriteStream(path.join(tmpdir.path, 'rw2')); + const s = fs.createWriteStream(tmpdir.resolve('rw2')); let emits = 0; s.on('close', () => { @@ -37,7 +36,7 @@ tmpdir.refresh(); } { - const s = fs.createWriteStream(path.join(tmpdir.path, 'rw'), { + const s = fs.createWriteStream(tmpdir.resolve('rw'), { autoClose: false }); diff --git a/test/parallel/test-fs-write-stream-encoding.js b/test/parallel/test-fs-write-stream-encoding.js index 5803d99fd7b33d..f06fae923c686b 100644 --- a/test/parallel/test-fs-write-stream-encoding.js +++ b/test/parallel/test-fs-write-stream-encoding.js @@ -3,14 +3,13 @@ require('../common'); const assert = require('assert'); const fixtures = require('../common/fixtures'); const fs = require('fs'); -const path = require('path'); const stream = require('stream'); const tmpdir = require('../common/tmpdir'); const firstEncoding = 'base64'; const secondEncoding = 'latin1'; const examplePath = fixtures.path('x.txt'); -const dummyPath = path.join(tmpdir.path, 'x.txt'); +const dummyPath = tmpdir.resolve('x.txt'); tmpdir.refresh(); diff --git a/test/parallel/test-fs-write-stream-end.js b/test/parallel/test-fs-write-stream-end.js index daaff6a2530346..7f0cc6554007fd 100644 --- a/test/parallel/test-fs-write-stream-end.js +++ b/test/parallel/test-fs-write-stream-end.js @@ -22,21 +22,20 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); { - const file = path.join(tmpdir.path, 'write-end-test0.txt'); + const file = tmpdir.resolve('write-end-test0.txt'); const stream = fs.createWriteStream(file); stream.end(); stream.on('close', common.mustCall()); } { - const file = path.join(tmpdir.path, 'write-end-test1.txt'); + const file = tmpdir.resolve('write-end-test1.txt'); const stream = fs.createWriteStream(file); stream.end('a\n', 'utf8'); stream.on('close', common.mustCall(function() { @@ -46,7 +45,7 @@ tmpdir.refresh(); } { - const file = path.join(tmpdir.path, 'write-end-test2.txt'); + const file = tmpdir.resolve('write-end-test2.txt'); const stream = fs.createWriteStream(file); stream.end(); diff --git a/test/parallel/test-fs-write-stream-file-handle-2.js b/test/parallel/test-fs-write-stream-file-handle-2.js index 25f68b14da70b3..fd1a1677916e52 100644 --- a/test/parallel/test-fs-write-stream-file-handle-2.js +++ b/test/parallel/test-fs-write-stream-file-handle-2.js @@ -1,10 +1,9 @@ 'use strict'; const common = require('../common'); const fs = require('fs'); -const path = require('path'); const assert = require('assert'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'write_stream_filehandle_test.txt'); +const file = tmpdir.resolve('write_stream_filehandle_test.txt'); const input = 'hello world'; tmpdir.refresh(); diff --git a/test/parallel/test-fs-write-stream-file-handle.js b/test/parallel/test-fs-write-stream-file-handle.js index 01c490ef5d0da1..9af16cd1b9070f 100644 --- a/test/parallel/test-fs-write-stream-file-handle.js +++ b/test/parallel/test-fs-write-stream-file-handle.js @@ -1,10 +1,9 @@ 'use strict'; const common = require('../common'); const fs = require('fs'); -const path = require('path'); const assert = require('assert'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'write_stream_filehandle_test.txt'); +const file = tmpdir.resolve('write_stream_filehandle_test.txt'); const input = 'hello world'; tmpdir.refresh(); diff --git a/test/parallel/test-fs-write-stream-fs.js b/test/parallel/test-fs-write-stream-fs.js index 2e15f57c764838..d4a94dd6e60612 100644 --- a/test/parallel/test-fs-write-stream-fs.js +++ b/test/parallel/test-fs-write-stream-fs.js @@ -1,13 +1,12 @@ 'use strict'; const common = require('../common'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); { - const file = path.join(tmpdir.path, 'write-end-test0.txt'); + const file = tmpdir.resolve('write-end-test0.txt'); const stream = fs.createWriteStream(file, { fs: { open: common.mustCall(fs.open), @@ -21,7 +20,7 @@ tmpdir.refresh(); { - const file = path.join(tmpdir.path, 'write-end-test1.txt'); + const file = tmpdir.resolve('write-end-test1.txt'); const stream = fs.createWriteStream(file, { fs: { open: common.mustCall(fs.open), diff --git a/test/parallel/test-fs-write-stream-throw-type-error.js b/test/parallel/test-fs-write-stream-throw-type-error.js index 77d546a61ace3d..93c52e96cb352a 100644 --- a/test/parallel/test-fs-write-stream-throw-type-error.js +++ b/test/parallel/test-fs-write-stream-throw-type-error.js @@ -2,11 +2,10 @@ require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); -const example = path.join(tmpdir.path, 'dummy'); +const example = tmpdir.resolve('dummy'); tmpdir.refresh(); // Should not throw. diff --git a/test/parallel/test-fs-write-stream.js b/test/parallel/test-fs-write-stream.js index 9f422a644379e8..a3dccf7cdcb7f1 100644 --- a/test/parallel/test-fs-write-stream.js +++ b/test/parallel/test-fs-write-stream.js @@ -22,12 +22,11 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); -const file = path.join(tmpdir.path, 'write.txt'); +const file = tmpdir.resolve('write.txt'); tmpdir.refresh(); diff --git a/test/parallel/test-fs-write-sync-optional-params.js b/test/parallel/test-fs-write-sync-optional-params.js index ac2c501f682242..61a71ac07cd8ac 100644 --- a/test/parallel/test-fs-write-sync-optional-params.js +++ b/test/parallel/test-fs-write-sync-optional-params.js @@ -7,12 +7,11 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const path = require('path'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const dest = path.resolve(tmpdir.path, 'tmp.txt'); +const dest = tmpdir.resolve('tmp.txt'); const buffer = Buffer.from('zyx'); function testInvalid(dest, expectedCode, ...bufferAndOptions) { diff --git a/test/parallel/test-fs-write-sync.js b/test/parallel/test-fs-write-sync.js index 13e8cc9fc7054a..733892c35e3b74 100644 --- a/test/parallel/test-fs-write-sync.js +++ b/test/parallel/test-fs-write-sync.js @@ -22,10 +22,9 @@ 'use strict'; require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); -const filename = path.join(tmpdir.path, 'write.txt'); +const filename = tmpdir.resolve('write.txt'); tmpdir.refresh(); diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js index 3ed02e25fdcf9e..59b83f531cf0a6 100644 --- a/test/parallel/test-fs-write.js +++ b/test/parallel/test-fs-write.js @@ -23,16 +23,15 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -const fn = path.join(tmpdir.path, 'write.txt'); -const fn2 = path.join(tmpdir.path, 'write2.txt'); -const fn3 = path.join(tmpdir.path, 'write3.txt'); -const fn4 = path.join(tmpdir.path, 'write4.txt'); +const fn = tmpdir.resolve('write.txt'); +const fn2 = tmpdir.resolve('write2.txt'); +const fn3 = tmpdir.resolve('write3.txt'); +const fn4 = tmpdir.resolve('write4.txt'); const expected = 'ümlaut.'; const constants = fs.constants; diff --git a/test/parallel/test-fs-writefile-with-fd.js b/test/parallel/test-fs-writefile-with-fd.js index 1af92c2a940da9..040e3368a0328b 100644 --- a/test/parallel/test-fs-writefile-with-fd.js +++ b/test/parallel/test-fs-writefile-with-fd.js @@ -7,14 +7,13 @@ const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const join = require('path').join; const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); { /* writeFileSync() test. */ - const filename = join(tmpdir.path, 'test.txt'); + const filename = tmpdir.resolve('test.txt'); /* Open the file descriptor. */ const fd = fs.openSync(filename, 'w'); @@ -46,7 +45,7 @@ process.on('beforeExit', common.mustCall(() => { { /* writeFile() test. */ - const file = join(tmpdir.path, 'test1.txt'); + const file = tmpdir.resolve('test1.txt'); /* Open the file descriptor. */ fs.open(file, 'w', common.mustSucceed((fd) => { @@ -68,7 +67,7 @@ process.on('beforeExit', common.mustCall(() => { // Test read-only file descriptor { - const file = join(tmpdir.path, 'test.txt'); + const file = tmpdir.resolve('test.txt'); fs.open(file, 'r', common.mustSucceed((fd) => { fdsToCloseOnExit.push(fd); @@ -80,7 +79,7 @@ process.on('beforeExit', common.mustCall(() => { { const controller = new AbortController(); const signal = controller.signal; - const file = join(tmpdir.path, 'test.txt'); + const file = tmpdir.resolve('test.txt'); fs.open(file, 'w', common.mustSucceed((fd) => { fdsToCloseOnExit.push(fd); diff --git a/test/parallel/test-fs-writev-promises.js b/test/parallel/test-fs-writev-promises.js index 650f00dae74b69..be40b83620ae3b 100644 --- a/test/parallel/test-fs-writev-promises.js +++ b/test/parallel/test-fs-writev-promises.js @@ -1,14 +1,13 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs').promises; const tmpdir = require('../common/tmpdir'); const expected = 'ümlaut. Лорем 運務ホソモ指及 आपको करने विकास 紙読決多密所 أضف'; let cnt = 0; function getFileName() { - return path.join(tmpdir.path, `writev_promises_${++cnt}.txt`); + return tmpdir.resolve(`writev_promises_${++cnt}.txt`); } tmpdir.refresh(); diff --git a/test/parallel/test-fs-writev-sync.js b/test/parallel/test-fs-writev-sync.js index 1db437972ed29d..e41796377a9f1b 100644 --- a/test/parallel/test-fs-writev-sync.js +++ b/test/parallel/test-fs-writev-sync.js @@ -2,7 +2,6 @@ require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); @@ -10,7 +9,7 @@ tmpdir.refresh(); const expected = 'ümlaut. Лорем 運務ホソモ指及 आपको करने विकास 紙読決多密所 أضف'; -const getFileName = (i) => path.join(tmpdir.path, `writev_sync_${i}.txt`); +const getFileName = (i) => tmpdir.resolve(`writev_sync_${i}.txt`); /** * Testing with a array of buffers input diff --git a/test/parallel/test-fs-writev.js b/test/parallel/test-fs-writev.js index 7ea52ef77ac4ee..407c898de2a01d 100644 --- a/test/parallel/test-fs-writev.js +++ b/test/parallel/test-fs-writev.js @@ -2,7 +2,6 @@ const common = require('../common'); const assert = require('assert'); -const path = require('path'); const fs = require('fs'); const tmpdir = require('../common/tmpdir'); @@ -10,7 +9,7 @@ tmpdir.refresh(); const expected = 'ümlaut. Лорем 運務ホソモ指及 आपको करने विकास 紙読決多密所 أضف'; -const getFileName = (i) => path.join(tmpdir.path, `writev_${i}.txt`); +const getFileName = (i) => tmpdir.resolve(`writev_${i}.txt`); /** * Testing with a array of buffers input