From b3adea21e3caf72d52a8501ea6b086fe6e7db9e1 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:13:42 +0200 Subject: [PATCH 01/13] test: use ES2017 syntax in test-fs-access --- test/parallel/test-fs-access.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 02e9356275dbc7..f37a95512e728d 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -13,9 +13,14 @@ const { internalBinding } = require('internal/test/binding'); const { UV_ENOENT } = internalBinding('uv'); const tmpdir = require('../common/tmpdir'); -const doesNotExist = path.join(tmpdir.path, '__this_should_not_exist'); -const readOnlyFile = path.join(tmpdir.path, 'read_only_file'); -const readWriteFile = path.join(tmpdir.path, 'read_write_file'); + +const { doesNotExist, readOnlyFile, readWriteFile } = Object.assign( + ...Object.entries({ + doesNotExist: '__this_should_not_exist', + readOnlyFile: 'read_only_file', + readWriteFile: 'read_write_file' + }).map(([k, v]) => ({ [k]: path.join(tmpdir.path, v) }))); + function createFileWithPerms(file, mode) { fs.writeFileSync(file, ''); @@ -59,10 +64,9 @@ if (!common.isWindows && process.getuid() === 0) { } } -assert.strictEqual(typeof fs.F_OK, 'number'); -assert.strictEqual(typeof fs.R_OK, 'number'); -assert.strictEqual(typeof fs.W_OK, 'number'); -assert.strictEqual(typeof fs.X_OK, 'number'); +[fs.F_OK, fs.R_OK, fs.W_OK, fs.X_OK].forEach( + (cons) => assert.strictEqual(cons, 'number') +); const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; From c91bacd0ec492c9ca3e4d408e29933aa13c11ec1 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:20:20 +0200 Subject: [PATCH 02/13] test: use ES2017 syntax in test-fs-append-file-sync --- test/parallel/test-fs-append-file-sync.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js index 90e3f97d8cf252..23b20cb1bc5081 100644 --- a/test/parallel/test-fs-append-file-sync.js +++ b/test/parallel/test-fs-append-file-sync.js @@ -40,7 +40,14 @@ const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); // test that empty file will be created and have content added -const filename = join(tmpdir.path, 'append-sync.txt'); +const { filename, filename2, filename3, filename4, filename5 } = + Object.assign(...Object.entries({ + filename: 'append-sync.txt', + filename2: 'append-sync2.txt', + filename3: 'append-sync3.txt', + filename4: 'append-sync4.txt', + filename5: 'append-sync5.txt' + }).map(([k, v]) => ({ [k]: join(tmpdir.path, v) }))); fs.appendFileSync(filename, data); @@ -49,7 +56,6 @@ const fileData = fs.readFileSync(filename); assert.strictEqual(Buffer.byteLength(data), fileData.length); // test that appends data to a non empty file -const filename2 = join(tmpdir.path, 'append-sync2.txt'); fs.writeFileSync(filename2, currentFileData); fs.appendFileSync(filename2, data); @@ -60,7 +66,6 @@ assert.strictEqual(Buffer.byteLength(data) + currentFileData.length, fileData2.length); // test that appendFileSync accepts buffers -const filename3 = join(tmpdir.path, 'append-sync3.txt'); fs.writeFileSync(filename3, currentFileData); const buf = Buffer.from(data, 'utf8'); @@ -71,7 +76,6 @@ const fileData3 = fs.readFileSync(filename3); assert.strictEqual(buf.length + currentFileData.length, fileData3.length); // test that appendFile accepts numbers. -const filename4 = join(tmpdir.path, 'append-sync4.txt'); fs.writeFileSync(filename4, currentFileData, { mode: m }); fs.appendFileSync(filename4, num, { mode: m }); @@ -88,7 +92,6 @@ assert.strictEqual(Buffer.byteLength(String(num)) + currentFileData.length, fileData4.length); // test that appendFile accepts file descriptors -const filename5 = join(tmpdir.path, 'append-sync5.txt'); fs.writeFileSync(filename5, currentFileData); const filename5fd = fs.openSync(filename5, 'a+', 0o600); From a8826dcb6c9060174882005f092e4974d95980d8 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:25:40 +0200 Subject: [PATCH 03/13] test: use ES2017 syntax in test-fs-copyfile --- test/parallel/test-fs-copyfile.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-fs-copyfile.js b/test/parallel/test-fs-copyfile.js index 90e7c7009d1680..a17261e8051f50 100644 --- a/test/parallel/test-fs-copyfile.js +++ b/test/parallel/test-fs-copyfile.js @@ -36,12 +36,9 @@ function verify(src, dest) { tmpdir.refresh(); // Verify that flags are defined. -assert.strictEqual(typeof COPYFILE_EXCL, 'number'); -assert.strictEqual(typeof COPYFILE_FICLONE, 'number'); -assert.strictEqual(typeof COPYFILE_FICLONE_FORCE, 'number'); -assert.strictEqual(typeof UV_FS_COPYFILE_EXCL, 'number'); -assert.strictEqual(typeof UV_FS_COPYFILE_FICLONE, 'number'); -assert.strictEqual(typeof UV_FS_COPYFILE_FICLONE_FORCE, 'number'); +[COPYFILE_EXCL, COPYFILE_FICLONE, COPYFILE_FICLONE_FORCE, UV_FS_COPYFILE_EXCL, + UV_FS_COPYFILE_FICLONE, UV_FS_COPYFILE_FICLONE_FORCE] + .forEach((cons) => assert.strictEqual(typeof cons, 'number')); assert.strictEqual(COPYFILE_EXCL, UV_FS_COPYFILE_EXCL); assert.strictEqual(COPYFILE_FICLONE, UV_FS_COPYFILE_FICLONE); assert.strictEqual(COPYFILE_FICLONE_FORCE, UV_FS_COPYFILE_FICLONE_FORCE); From 3b3f2bfd31124890dd75ced25f216e3f04e78717 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:36:27 +0200 Subject: [PATCH 04/13] test: use ES2017 syntax in test-fs-open-flags --- test/parallel/test-fs-open-flags.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/test/parallel/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js index 546d68e31274f4..5af79038e4e771 100644 --- a/test/parallel/test-fs-open-flags.js +++ b/test/parallel/test-fs-open-flags.js @@ -29,15 +29,9 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); -const O_APPEND = fs.constants.O_APPEND || 0; -const O_CREAT = fs.constants.O_CREAT || 0; -const O_EXCL = fs.constants.O_EXCL || 0; -const O_RDONLY = fs.constants.O_RDONLY || 0; -const O_RDWR = fs.constants.O_RDWR || 0; -const O_SYNC = fs.constants.O_SYNC || 0; -const O_DSYNC = fs.constants.O_DSYNC || 0; -const O_TRUNC = fs.constants.O_TRUNC || 0; -const O_WRONLY = fs.constants.O_WRONLY || 0; +// 0 if not found in fs.constants +const { O_APPEND = 0, O_CREAT = 0, O_EXCL = 0, O_RDONLY = 0, O_RDWR = 0, + O_SYNC = 0, O_DSYNC = 0, O_TRUNC = 0, O_WRONLY = 0 } = fs.constants; const { stringToFlags } = require('internal/fs/utils'); From 52efdf32636296cf957c6042bd23cc596520ec94 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:38:34 +0200 Subject: [PATCH 05/13] test: use ES2017 syntax in test-fs-open-mask --- test/parallel/test-fs-open-mode-mask.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/parallel/test-fs-open-mode-mask.js b/test/parallel/test-fs-open-mode-mask.js index 0cd9a2c5923a71..67a246e20b4c76 100644 --- a/test/parallel/test-fs-open-mode-mask.js +++ b/test/parallel/test-fs-open-mode-mask.js @@ -7,13 +7,8 @@ const assert = require('assert'); const path = require('path'); const fs = require('fs'); -let mode; +const mode = (common.isWindows) ? 0o444 : 0o644; -if (common.isWindows) { - mode = 0o444; -} else { - mode = 0o644; -} const maskToIgnore = 0o10000; From 90d5f02c29b8456bac32186fba58d16fe3490ae3 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 21:52:49 +0200 Subject: [PATCH 06/13] test: updated syntax in test-fs-stat-bigint --- test/parallel/test-fs-stat-bigint.js | 32 ++++------------------------ 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/test/parallel/test-fs-stat-bigint.js b/test/parallel/test-fs-stat-bigint.js index 4691b2dd9d267e..893cb22ae0072e 100644 --- a/test/parallel/test-fs-stat-bigint.js +++ b/test/parallel/test-fs-stat-bigint.js @@ -30,34 +30,10 @@ function verifyStats(bigintStats, numStats) { `Number version ${time}, BigInt version ${time2}n`); } else if (key === 'mode') { assert.strictEqual(bigintStats[key], BigInt(val)); - assert.strictEqual( - bigintStats.isBlockDevice(), - numStats.isBlockDevice() - ); - assert.strictEqual( - bigintStats.isCharacterDevice(), - numStats.isCharacterDevice() - ); - assert.strictEqual( - bigintStats.isDirectory(), - numStats.isDirectory() - ); - assert.strictEqual( - bigintStats.isFIFO(), - numStats.isFIFO() - ); - assert.strictEqual( - bigintStats.isFile(), - numStats.isFile() - ); - assert.strictEqual( - bigintStats.isSocket(), - numStats.isSocket() - ); - assert.strictEqual( - bigintStats.isSymbolicLink(), - numStats.isSymbolicLink() - ); + ['isBlockDevice', 'isCharacterDevice', 'isDirectory', 'isFIFO', 'isFile', + 'isFile', 'isSocket', 'isSymbolicLink' ].forEach( + (fct) => assert.strictEqual(bigintStats[fct](), numStats[fct]())); + } else if (common.isWindows && (key === 'blksize' || key === 'blocks')) { assert.strictEqual(bigintStats[key], undefined); assert.strictEqual(numStats[key], undefined); From 1721b43649d7216c83810a8393050d45056dded5 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sat, 22 Sep 2018 22:50:03 +0200 Subject: [PATCH 07/13] test: fix missing typeof in test-fs-access --- test/parallel/test-fs-access.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index f37a95512e728d..d8889a0c65eb6b 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -65,7 +65,7 @@ if (!common.isWindows && process.getuid() === 0) { } [fs.F_OK, fs.R_OK, fs.W_OK, fs.X_OK].forEach( - (cons) => assert.strictEqual(cons, 'number') + (cons) => assert.strictEqual(typeof cons, 'number') ); const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; From 29ba8b581037d4185e32ec112ff3bf30f401dec2 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sun, 23 Sep 2018 11:21:30 +0200 Subject: [PATCH 08/13] test: remove .map variable for initialization variables --- test/parallel/test-fs-access.js | 9 +++------ test/parallel/test-fs-append-file-sync.js | 16 +++++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index d8889a0c65eb6b..4724841bf28be7 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -14,12 +14,9 @@ const { UV_ENOENT } = internalBinding('uv'); const tmpdir = require('../common/tmpdir'); -const { doesNotExist, readOnlyFile, readWriteFile } = Object.assign( - ...Object.entries({ - doesNotExist: '__this_should_not_exist', - readOnlyFile: 'read_only_file', - readWriteFile: 'read_write_file' - }).map(([k, v]) => ({ [k]: path.join(tmpdir.path, v) }))); +const doesNotExist = path.join(tmpdir.path, '__this_should_not_exist'); +const readOnlyFile = path.join(tmpdir.path, 'read_only_file'); +const readWriteFile = path.join(tmpdir.path, 'read_write_file'); function createFileWithPerms(file, mode) { diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js index 23b20cb1bc5081..a5299661168957 100644 --- a/test/parallel/test-fs-append-file-sync.js +++ b/test/parallel/test-fs-append-file-sync.js @@ -39,16 +39,14 @@ const data = '南越国是前203年至前111年存在于岭南地区的一个国 const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -// test that empty file will be created and have content added -const { filename, filename2, filename3, filename4, filename5 } = - Object.assign(...Object.entries({ - filename: 'append-sync.txt', - filename2: 'append-sync2.txt', - filename3: 'append-sync3.txt', - filename4: 'append-sync4.txt', - filename5: 'append-sync5.txt' - }).map(([k, v]) => ({ [k]: join(tmpdir.path, v) }))); +// the used files +const filename = join(tmpdir.path, 'append-sync.txt'); +const filename2 = join(tmpdir.path, 'append-sync2.txt'); +const filename3 = join(tmpdir.path, 'append-sync3.txt'); +const filename4 = join(tmpdir.path, 'append-sync4.txt'); +const filename5 = join(tmpdir.path, 'append-sync5.txt'); +// test that empty file will be created and have content added fs.appendFileSync(filename, data); const fileData = fs.readFileSync(filename); From be965018b411095b5c5b357c1c721a610d4cded1 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sun, 23 Sep 2018 11:47:07 +0200 Subject: [PATCH 09/13] test: remove whitespace --- test/parallel/test-fs-access.js | 2 -- test/parallel/test-fs-open-mode-mask.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 4724841bf28be7..49ae44c8b54bfe 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -13,12 +13,10 @@ const { internalBinding } = require('internal/test/binding'); const { UV_ENOENT } = internalBinding('uv'); const tmpdir = require('../common/tmpdir'); - const doesNotExist = path.join(tmpdir.path, '__this_should_not_exist'); const readOnlyFile = path.join(tmpdir.path, 'read_only_file'); const readWriteFile = path.join(tmpdir.path, 'read_write_file'); - function createFileWithPerms(file, mode) { fs.writeFileSync(file, ''); fs.chmodSync(file, mode); diff --git a/test/parallel/test-fs-open-mode-mask.js b/test/parallel/test-fs-open-mode-mask.js index 67a246e20b4c76..f1ec243b463071 100644 --- a/test/parallel/test-fs-open-mode-mask.js +++ b/test/parallel/test-fs-open-mode-mask.js @@ -7,7 +7,7 @@ const assert = require('assert'); const path = require('path'); const fs = require('fs'); -const mode = (common.isWindows) ? 0o444 : 0o644; +const mode = common.isWindows ? 0o444 : 0o644; const maskToIgnore = 0o10000; From f45ead255445c08dc8b3b491685e7b2dbea602e0 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sun, 23 Sep 2018 17:48:23 +0200 Subject: [PATCH 10/13] test: separate lines --- test/parallel/test-fs-copyfile.js | 12 +++++++++--- test/parallel/test-fs-open-flags.js | 12 ++++++++++-- test/parallel/test-fs-stat-bigint.js | 14 +++++++++++--- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-fs-copyfile.js b/test/parallel/test-fs-copyfile.js index a17261e8051f50..d8149fc8c6ca03 100644 --- a/test/parallel/test-fs-copyfile.js +++ b/test/parallel/test-fs-copyfile.js @@ -36,9 +36,15 @@ function verify(src, dest) { tmpdir.refresh(); // Verify that flags are defined. -[COPYFILE_EXCL, COPYFILE_FICLONE, COPYFILE_FICLONE_FORCE, UV_FS_COPYFILE_EXCL, - UV_FS_COPYFILE_FICLONE, UV_FS_COPYFILE_FICLONE_FORCE] - .forEach((cons) => assert.strictEqual(typeof cons, 'number')); +[COPYFILE_EXCL, + COPYFILE_FICLONE, + COPYFILE_FICLONE_FORCE, + UV_FS_COPYFILE_EXCL, + UV_FS_COPYFILE_FICLONE, + UV_FS_COPYFILE_FICLONE_FORCE +].forEach( + (cons) => assert.strictEqual(typeof cons, 'number') +); assert.strictEqual(COPYFILE_EXCL, UV_FS_COPYFILE_EXCL); assert.strictEqual(COPYFILE_FICLONE, UV_FS_COPYFILE_FICLONE); assert.strictEqual(COPYFILE_FICLONE_FORCE, UV_FS_COPYFILE_FICLONE_FORCE); diff --git a/test/parallel/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js index 5af79038e4e771..d1fee24de690ac 100644 --- a/test/parallel/test-fs-open-flags.js +++ b/test/parallel/test-fs-open-flags.js @@ -30,8 +30,16 @@ const fs = require('fs'); const path = require('path'); // 0 if not found in fs.constants -const { O_APPEND = 0, O_CREAT = 0, O_EXCL = 0, O_RDONLY = 0, O_RDWR = 0, - O_SYNC = 0, O_DSYNC = 0, O_TRUNC = 0, O_WRONLY = 0 } = fs.constants; +const { O_APPEND = 0, + O_CREAT = 0, + O_EXCL = 0, + O_RDONLY = 0, + O_RDWR = 0, + O_SYNC = 0, + O_DSYNC = 0, + O_TRUNC = 0, + O_WRONLY = 0 +} = fs.constants; const { stringToFlags } = require('internal/fs/utils'); diff --git a/test/parallel/test-fs-stat-bigint.js b/test/parallel/test-fs-stat-bigint.js index 893cb22ae0072e..bf7f2b9c76f2d6 100644 --- a/test/parallel/test-fs-stat-bigint.js +++ b/test/parallel/test-fs-stat-bigint.js @@ -30,9 +30,17 @@ function verifyStats(bigintStats, numStats) { `Number version ${time}, BigInt version ${time2}n`); } else if (key === 'mode') { assert.strictEqual(bigintStats[key], BigInt(val)); - ['isBlockDevice', 'isCharacterDevice', 'isDirectory', 'isFIFO', 'isFile', - 'isFile', 'isSocket', 'isSymbolicLink' ].forEach( - (fct) => assert.strictEqual(bigintStats[fct](), numStats[fct]())); + ['isBlockDevice', + 'isCharacterDevice', + 'isDirectory', + 'isFIFO', + 'isFile', + 'isFile', + 'isSocket', + 'isSymbolicLink' + ].forEach( + (fct) => assert.strictEqual(bigintStats[fct](), numStats[fct]()) + ); } else if (common.isWindows && (key === 'blksize' || key === 'blocks')) { assert.strictEqual(bigintStats[key], undefined); From 3b9a133e70dde0fa98b368cb76cd9e783bf53ac6 Mon Sep 17 00:00:00 2001 From: jy95 Date: Sun, 23 Sep 2018 17:57:01 +0200 Subject: [PATCH 11/13] test: reset test-fs-append-file-sync to previous version --- test/parallel/test-fs-append-file-sync.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js index a5299661168957..90e3f97d8cf252 100644 --- a/test/parallel/test-fs-append-file-sync.js +++ b/test/parallel/test-fs-append-file-sync.js @@ -39,14 +39,9 @@ const data = '南越国是前203年至前111年存在于岭南地区的一个国 const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); -// the used files +// test that empty file will be created and have content added const filename = join(tmpdir.path, 'append-sync.txt'); -const filename2 = join(tmpdir.path, 'append-sync2.txt'); -const filename3 = join(tmpdir.path, 'append-sync3.txt'); -const filename4 = join(tmpdir.path, 'append-sync4.txt'); -const filename5 = join(tmpdir.path, 'append-sync5.txt'); -// test that empty file will be created and have content added fs.appendFileSync(filename, data); const fileData = fs.readFileSync(filename); @@ -54,6 +49,7 @@ const fileData = fs.readFileSync(filename); assert.strictEqual(Buffer.byteLength(data), fileData.length); // test that appends data to a non empty file +const filename2 = join(tmpdir.path, 'append-sync2.txt'); fs.writeFileSync(filename2, currentFileData); fs.appendFileSync(filename2, data); @@ -64,6 +60,7 @@ assert.strictEqual(Buffer.byteLength(data) + currentFileData.length, fileData2.length); // test that appendFileSync accepts buffers +const filename3 = join(tmpdir.path, 'append-sync3.txt'); fs.writeFileSync(filename3, currentFileData); const buf = Buffer.from(data, 'utf8'); @@ -74,6 +71,7 @@ const fileData3 = fs.readFileSync(filename3); assert.strictEqual(buf.length + currentFileData.length, fileData3.length); // test that appendFile accepts numbers. +const filename4 = join(tmpdir.path, 'append-sync4.txt'); fs.writeFileSync(filename4, currentFileData, { mode: m }); fs.appendFileSync(filename4, num, { mode: m }); @@ -90,6 +88,7 @@ assert.strictEqual(Buffer.byteLength(String(num)) + currentFileData.length, fileData4.length); // test that appendFile accepts file descriptors +const filename5 = join(tmpdir.path, 'append-sync5.txt'); fs.writeFileSync(filename5, currentFileData); const filename5fd = fs.openSync(filename5, 'a+', 0o600); From 7e2ee7bd1a9cc89efc3b0bfcf1e6e033b5bfb5e4 Mon Sep 17 00:00:00 2001 From: jy95 Date: Tue, 25 Sep 2018 13:13:57 +0200 Subject: [PATCH 12/13] test: revert assertion changes --- test/parallel/test-fs-access.js | 7 ++++--- test/parallel/test-fs-copyfile.js | 15 ++++++--------- test/parallel/test-fs-open-mode-mask.js | 1 - test/parallel/test-fs-stat-bigint.js | 2 -- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 49ae44c8b54bfe..02e9356275dbc7 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -59,9 +59,10 @@ if (!common.isWindows && process.getuid() === 0) { } } -[fs.F_OK, fs.R_OK, fs.W_OK, fs.X_OK].forEach( - (cons) => assert.strictEqual(typeof cons, 'number') -); +assert.strictEqual(typeof fs.F_OK, 'number'); +assert.strictEqual(typeof fs.R_OK, 'number'); +assert.strictEqual(typeof fs.W_OK, 'number'); +assert.strictEqual(typeof fs.X_OK, 'number'); const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; diff --git a/test/parallel/test-fs-copyfile.js b/test/parallel/test-fs-copyfile.js index d8149fc8c6ca03..90e7c7009d1680 100644 --- a/test/parallel/test-fs-copyfile.js +++ b/test/parallel/test-fs-copyfile.js @@ -36,15 +36,12 @@ function verify(src, dest) { tmpdir.refresh(); // Verify that flags are defined. -[COPYFILE_EXCL, - COPYFILE_FICLONE, - COPYFILE_FICLONE_FORCE, - UV_FS_COPYFILE_EXCL, - UV_FS_COPYFILE_FICLONE, - UV_FS_COPYFILE_FICLONE_FORCE -].forEach( - (cons) => assert.strictEqual(typeof cons, 'number') -); +assert.strictEqual(typeof COPYFILE_EXCL, 'number'); +assert.strictEqual(typeof COPYFILE_FICLONE, 'number'); +assert.strictEqual(typeof COPYFILE_FICLONE_FORCE, 'number'); +assert.strictEqual(typeof UV_FS_COPYFILE_EXCL, 'number'); +assert.strictEqual(typeof UV_FS_COPYFILE_FICLONE, 'number'); +assert.strictEqual(typeof UV_FS_COPYFILE_FICLONE_FORCE, 'number'); assert.strictEqual(COPYFILE_EXCL, UV_FS_COPYFILE_EXCL); assert.strictEqual(COPYFILE_FICLONE, UV_FS_COPYFILE_FICLONE); assert.strictEqual(COPYFILE_FICLONE_FORCE, UV_FS_COPYFILE_FICLONE_FORCE); diff --git a/test/parallel/test-fs-open-mode-mask.js b/test/parallel/test-fs-open-mode-mask.js index f1ec243b463071..4100fbb32c2046 100644 --- a/test/parallel/test-fs-open-mode-mask.js +++ b/test/parallel/test-fs-open-mode-mask.js @@ -9,7 +9,6 @@ const fs = require('fs'); const mode = common.isWindows ? 0o444 : 0o644; - const maskToIgnore = 0o10000; const tmpdir = require('../common/tmpdir'); diff --git a/test/parallel/test-fs-stat-bigint.js b/test/parallel/test-fs-stat-bigint.js index bf7f2b9c76f2d6..cee94dadfb88ad 100644 --- a/test/parallel/test-fs-stat-bigint.js +++ b/test/parallel/test-fs-stat-bigint.js @@ -35,13 +35,11 @@ function verifyStats(bigintStats, numStats) { 'isDirectory', 'isFIFO', 'isFile', - 'isFile', 'isSocket', 'isSymbolicLink' ].forEach( (fct) => assert.strictEqual(bigintStats[fct](), numStats[fct]()) ); - } else if (common.isWindows && (key === 'blksize' || key === 'blocks')) { assert.strictEqual(bigintStats[key], undefined); assert.strictEqual(numStats[key], undefined); From 7f6555edac5cda5054530468306dbcb8881b1a94 Mon Sep 17 00:00:00 2001 From: jy95 Date: Fri, 23 Nov 2018 22:54:06 +0100 Subject: [PATCH 13/13] test: revert changes in test-fs-stat-bigint.js --- test/parallel/test-fs-stat-bigint.js | 36 +++++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/test/parallel/test-fs-stat-bigint.js b/test/parallel/test-fs-stat-bigint.js index cee94dadfb88ad..4691b2dd9d267e 100644 --- a/test/parallel/test-fs-stat-bigint.js +++ b/test/parallel/test-fs-stat-bigint.js @@ -30,15 +30,33 @@ function verifyStats(bigintStats, numStats) { `Number version ${time}, BigInt version ${time2}n`); } else if (key === 'mode') { assert.strictEqual(bigintStats[key], BigInt(val)); - ['isBlockDevice', - 'isCharacterDevice', - 'isDirectory', - 'isFIFO', - 'isFile', - 'isSocket', - 'isSymbolicLink' - ].forEach( - (fct) => assert.strictEqual(bigintStats[fct](), numStats[fct]()) + assert.strictEqual( + bigintStats.isBlockDevice(), + numStats.isBlockDevice() + ); + assert.strictEqual( + bigintStats.isCharacterDevice(), + numStats.isCharacterDevice() + ); + assert.strictEqual( + bigintStats.isDirectory(), + numStats.isDirectory() + ); + assert.strictEqual( + bigintStats.isFIFO(), + numStats.isFIFO() + ); + assert.strictEqual( + bigintStats.isFile(), + numStats.isFile() + ); + assert.strictEqual( + bigintStats.isSocket(), + numStats.isSocket() + ); + assert.strictEqual( + bigintStats.isSymbolicLink(), + numStats.isSymbolicLink() ); } else if (common.isWindows && (key === 'blksize' || key === 'blocks')) { assert.strictEqual(bigintStats[key], undefined);