diff options
| author | Richard Lau <riclau@uk.ibm.com> | 2019-02-12 15:39:10 +0000 |
|---|---|---|
| committer | Richard Lau <riclau@uk.ibm.com> | 2019-02-15 01:55:58 -0500 |
| commit | 51d20b6a8f695947a700e7fed8f0e5b33b79cefb (patch) | |
| tree | f36e95adcfe96e9748686d4c19beffadd5bc9987 /test | |
| parent | 8e68dc53b3526f46455c5b094cd8c08e87e22df1 (diff) | |
| download | android-node-v8-51d20b6a8f695947a700e7fed8f0e5b33b79cefb.tar.gz android-node-v8-51d20b6a8f695947a700e7fed8f0e5b33b79cefb.tar.bz2 android-node-v8-51d20b6a8f695947a700e7fed8f0e5b33b79cefb.zip | |
fs, src, lib: fix `blksize` & `blocks` on Windows
libuv returns values for `blksize` and `blocks` on stat calls so
do not coerce them into `undefined` on Windows.
PR-URL: https://github.com/nodejs/node/pull/26056
Fixes: https://github.com/nodejs/node/issues/25913
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/parallel/test-fs-stat-bigint.js | 3 | ||||
| -rw-r--r-- | test/parallel/test-fs-stat.js | 9 | ||||
| -rw-r--r-- | test/parallel/test-fs-watchfile-bigint.js | 4 | ||||
| -rw-r--r-- | test/parallel/test-fs-watchfile.js | 4 |
4 files changed, 7 insertions, 13 deletions
diff --git a/test/parallel/test-fs-stat-bigint.js b/test/parallel/test-fs-stat-bigint.js index e5c21138a2..d004112680 100644 --- a/test/parallel/test-fs-stat-bigint.js +++ b/test/parallel/test-fs-stat-bigint.js @@ -59,9 +59,6 @@ function verifyStats(bigintStats, numStats) { bigintStats.isSymbolicLink(), numStats.isSymbolicLink() ); - } else if (common.isWindows && (key === 'blksize' || key === 'blocks')) { - assert.strictEqual(bigintStats[key], undefined); - assert.strictEqual(numStats[key], undefined); } else if (Number.isSafeInteger(val)) { assert.strictEqual( bigintStats[key], BigInt(val), diff --git a/test/parallel/test-fs-stat.js b/test/parallel/test-fs-stat.js index 1003890bb8..a44e2ce3a7 100644 --- a/test/parallel/test-fs-stat.js +++ b/test/parallel/test-fs-stat.js @@ -94,16 +94,13 @@ fs.stat(__filename, common.mustCall(function(err, s) { assert.strictEqual(s.isSymbolicLink(), false); const keys = [ 'dev', 'mode', 'nlink', 'uid', - 'gid', 'rdev', 'ino', 'size', + 'gid', 'rdev', 'blksize', 'ino', 'size', 'blocks', 'atime', 'mtime', 'ctime', 'birthtime', 'atimeMs', 'mtimeMs', 'ctimeMs', 'birthtimeMs' ]; - if (!common.isWindows) { - keys.push('blocks', 'blksize'); - } const numberFields = [ - 'dev', 'mode', 'nlink', 'uid', 'gid', 'rdev', 'ino', 'size', - 'atimeMs', 'mtimeMs', 'ctimeMs', 'birthtimeMs' + 'dev', 'mode', 'nlink', 'uid', 'gid', 'rdev', 'blksize', 'ino', 'size', + 'blocks', 'atimeMs', 'mtimeMs', 'ctimeMs', 'birthtimeMs' ]; const dateFields = ['atime', 'mtime', 'ctime', 'birthtime']; keys.forEach(function(k) { diff --git a/test/parallel/test-fs-watchfile-bigint.js b/test/parallel/test-fs-watchfile-bigint.js index 89cefd12e0..76c619260e 100644 --- a/test/parallel/test-fs-watchfile-bigint.js +++ b/test/parallel/test-fs-watchfile-bigint.js @@ -15,10 +15,10 @@ const expectedStatObject = new fs.Stats( 0n, // uid 0n, // gid 0n, // rdev - common.isWindows ? undefined : 0n, // blksize + 0n, // blksize 0n, // ino 0n, // size - common.isWindows ? undefined : 0n, // blocks + 0n, // blocks 0n, // atim_msec 0n, // mtim_msec 0n, // ctim_msec diff --git a/test/parallel/test-fs-watchfile.js b/test/parallel/test-fs-watchfile.js index ba4becb262..b3618792cd 100644 --- a/test/parallel/test-fs-watchfile.js +++ b/test/parallel/test-fs-watchfile.js @@ -38,10 +38,10 @@ const expectedStatObject = new fs.Stats( 0, // uid 0, // gid 0, // rdev - common.isWindows ? undefined : 0, // blksize + 0, // blksize 0, // ino 0, // size - common.isWindows ? undefined : 0, // blocks + 0, // blocks Date.UTC(1970, 0, 1, 0, 0, 0), // atime Date.UTC(1970, 0, 1, 0, 0, 0), // mtime Date.UTC(1970, 0, 1, 0, 0, 0), // ctime |