1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: improve test-fs-access

Browse Source 
* use const and let instead of var
* use common.mustCall to control functions execution
* use assert.ifError instead of assert.strictEqual for errors
* use arrow functions

PR-URL: https://github.com/nodejs/node/pull/10542
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Adrian Estrada 2017-01-02 22:10:40 -05:00 committed by Luigi Pinca
parent f43ea2a6ae
commit 6c7219efcd
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
test/parallel/test-fs-access.js
View File

@ -3,11 +3,11 @@ const common = require('../common');
const assert = require('assert'); const assert = require('assert');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
var doesNotExist = path.join(common.tmpDir, '__this_should_not_exist'); const doesNotExist = path.join(common.tmpDir, '__this_should_not_exist');
var readOnlyFile = path.join(common.tmpDir, 'read_only_file'); const readOnlyFile = path.join(common.tmpDir, 'read_only_file');
var readWriteFile = path.join(common.tmpDir, 'read_write_file'); const readWriteFile = path.join(common.tmpDir, 'read_write_file');
var removeFile = function(file) { const removeFile = function(file) {
try { try {
fs.unlinkSync(file); fs.unlinkSync(file);
} catch (err) { } catch (err) {
@ -15,7 +15,7 @@ var removeFile = function(file) {
} }
}; };
var createFileWithPerms = function(file, mode) { const createFileWithPerms = function(file, mode) {
removeFile(file); removeFile(file);
fs.writeFileSync(file, ''); fs.writeFileSync(file, '');
fs.chmodSync(file, mode); fs.chmodSync(file, mode);
@ -48,7 +48,7 @@ createFileWithPerms(readWriteFile, 0o666);
* id, but that's fine. In this case, it is the responsability of the * id, but that's fine. In this case, it is the responsability of the
* continuous integration platform to take care of that. * continuous integration platform to take care of that.
*/ */
var hasWriteAccessForReadonlyFile = false; let hasWriteAccessForReadonlyFile = false;
if (!common.isWindows && process.getuid() === 0) { if (!common.isWindows && process.getuid() === 0) {
hasWriteAccessForReadonlyFile = true; hasWriteAccessForReadonlyFile = true;
try { try {
@ -63,62 +63,62 @@ assert.strictEqual(typeof fs.R_OK, 'number');
assert.strictEqual(typeof fs.W_OK, 'number'); assert.strictEqual(typeof fs.W_OK, 'number');
assert.strictEqual(typeof fs.X_OK, 'number'); assert.strictEqual(typeof fs.X_OK, 'number');
fs.access(__filename, function(err) { fs.access(__filename, common.mustCall((err) => {
assert.strictEqual(err, null, 'error should not exist'); assert.ifError(err);
}); }));
fs.access(__filename, fs.R_OK, function(err) { fs.access(__filename, fs.R_OK, common.mustCall((err) => {
assert.strictEqual(err, null, 'error should not exist'); assert.ifError(err);
}); }));
fs.access(doesNotExist, function(err) { fs.access(doesNotExist, common.mustCall((err) => {
assert.notEqual(err, null, 'error should exist'); assert.notEqual(err, null, 'error should exist');
assert.strictEqual(err.code, 'ENOENT'); assert.strictEqual(err.code, 'ENOENT');
assert.strictEqual(err.path, doesNotExist); assert.strictEqual(err.path, doesNotExist);
}); }));
fs.access(readOnlyFile, fs.F_OK | fs.R_OK, function(err) { fs.access(readOnlyFile, fs.F_OK | fs.R_OK, common.mustCall((err) => {
assert.strictEqual(err, null, 'error should not exist'); assert.ifError(err);
}); }));
fs.access(readOnlyFile, fs.W_OK, function(err) { fs.access(readOnlyFile, fs.W_OK, common.mustCall((err) => {
if (hasWriteAccessForReadonlyFile) { if (hasWriteAccessForReadonlyFile) {
assert.equal(err, null, 'error should not exist'); assert.ifError(err);
} else { } else {
assert.notEqual(err, null, 'error should exist'); assert.notEqual(err, null, 'error should exist');
assert.strictEqual(err.path, readOnlyFile); assert.strictEqual(err.path, readOnlyFile);
} }
}); }));
assert.throws(function() { assert.throws(() => {
fs.access(100, fs.F_OK, function(err) {}); fs.access(100, fs.F_OK, (err) => {});
}, /path must be a string or Buffer/); }, /path must be a string or Buffer/);
assert.throws(function() { assert.throws(() => {
fs.access(__filename, fs.F_OK); fs.access(__filename, fs.F_OK);
}, /"callback" argument must be a function/); }, /"callback" argument must be a function/);
assert.throws(function() { assert.throws(() => {
fs.access(__filename, fs.F_OK, {}); fs.access(__filename, fs.F_OK, {});
}, /"callback" argument must be a function/); }, /"callback" argument must be a function/);
assert.doesNotThrow(function() { assert.doesNotThrow(() => {
fs.accessSync(__filename); fs.accessSync(__filename);
}); });
assert.doesNotThrow(function() { assert.doesNotThrow(() => {
var mode = fs.F_OK | fs.R_OK | fs.W_OK; var mode = fs.F_OK | fs.R_OK | fs.W_OK;
fs.accessSync(readWriteFile, mode); fs.accessSync(readWriteFile, mode);
}); });
assert.throws(function() { assert.throws(() => {
fs.accessSync(doesNotExist); fs.accessSync(doesNotExist);
}, function(err) { }, (err) => {
return err.code === 'ENOENT' && err.path === doesNotExist; return err.code === 'ENOENT' && err.path === doesNotExist;
}); });
process.on('exit', function() { process.on('exit', () => {
removeFile(readOnlyFile); removeFile(readOnlyFile);
removeFile(readWriteFile); removeFile(readWriteFile);
}); });