test: remove common.fileExists()

common.fileExists() can be replaced with fs.existsSync().

PR-URL: https://github.com/nodejs/node/pull/22151
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
This commit is contained in:
Rich Trott 2018-08-06 06:47:11 -07:00
parent 6ad12d47f5
commit 41ae423718
25 changed files with 37 additions and 52 deletions

View File

@ -121,12 +121,6 @@ Tests whether `name`, `expected`, and `code` are part of a raised warning. If
an expected warning does not have a code then `common.noWarnCode` can be used an expected warning does not have a code then `common.noWarnCode` can be used
to indicate this. to indicate this.
### fileExists(pathname)
* pathname [&lt;string>]
* return [&lt;boolean>]
Checks if `pathname` exists
### getArrayBufferViews(buf) ### getArrayBufferViews(buf)
* `buf` [&lt;Buffer>] * `buf` [&lt;Buffer>]
* return [&lt;ArrayBufferView&#91;&#93;>] * return [&lt;ArrayBufferView&#91;&#93;>]

View File

@ -476,17 +476,8 @@ exports.hasMultiLocalhost = function hasMultiLocalhost() {
return ret === 0; return ret === 0;
}; };
exports.fileExists = function(pathname) {
try {
fs.accessSync(pathname);
return true;
} catch (err) {
return false;
}
};
exports.skipIfEslintMissing = function() { exports.skipIfEslintMissing = function() {
if (!exports.fileExists( if (!fs.existsSync(
path.join(__dirname, '..', '..', 'tools', 'node_modules', 'eslint') path.join(__dirname, '..', '..', 'tools', 'node_modules', 'eslint')
)) { )) {
exports.skip('missing ESLint'); exports.skip('missing ESLint');

View File

@ -33,7 +33,6 @@ const {
mustCallAtLeast, mustCallAtLeast,
mustCallAsync, mustCallAsync,
hasMultiLocalhost, hasMultiLocalhost,
fileExists,
skipIfEslintMissing, skipIfEslintMissing,
canCreateSymLink, canCreateSymLink,
getCallSite, getCallSite,
@ -92,7 +91,6 @@ export {
mustCallAtLeast, mustCallAtLeast,
mustCallAsync, mustCallAsync,
hasMultiLocalhost, hasMultiLocalhost,
fileExists,
skipIfEslintMissing, skipIfEslintMissing,
canCreateSymLink, canCreateSymLink,
getCallSite, getCallSite,

View File

@ -23,10 +23,11 @@
const common = require('../common'); const common = require('../common');
const spawn = require('child_process').spawn; const spawn = require('child_process').spawn;
const assert = require('assert'); const assert = require('assert');
const fs = require('fs');
const enoentPath = 'foo123'; const enoentPath = 'foo123';
const spawnargs = ['bar']; const spawnargs = ['bar'];
assert.strictEqual(common.fileExists(enoentPath), false); assert.strictEqual(fs.existsSync(enoentPath), false);
const enoentChild = spawn(enoentPath, spawnargs); const enoentChild = spawn(enoentPath, spawnargs);
enoentChild.on('error', common.mustCall(function(err) { enoentChild.on('error', common.mustCall(function(err) {

View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const common = require('../common'); require('../common');
const tmpdir = require('../common/tmpdir'); const tmpdir = require('../common/tmpdir');
// This test ensures that fs.existsSync doesn't incorrectly return false. // This test ensures that fs.existsSync doesn't incorrectly return false.
@ -28,7 +28,7 @@ for (let i = 0; i < 50; i++) {
} }
// Test if file exists synchronously // Test if file exists synchronously
assert(common.fileExists(dir), 'Directory is not accessible'); assert(fs.existsSync(dir), 'Directory is not accessible');
// Test if file exists asynchronously // Test if file exists asynchronously
fs.access(dir, function(err) { fs.access(dir, function(err) {

View File

@ -10,11 +10,11 @@ const d = path.join(tmpdir.path, 'dir');
tmpdir.refresh(); tmpdir.refresh();
// Make sure the directory does not exist // Make sure the directory does not exist
assert(!common.fileExists(d)); assert(!fs.existsSync(d));
// Create the directory now // Create the directory now
fs.mkdirSync(d); fs.mkdirSync(d);
// Make sure the directory exists // Make sure the directory exists
assert(common.fileExists(d)); assert(fs.existsSync(d));
// Try creating again, it should fail with EEXIST // Try creating again, it should fail with EEXIST
assert.throws(function() { assert.throws(function() {
fs.mkdirSync(d); fs.mkdirSync(d);
@ -22,7 +22,7 @@ assert.throws(function() {
// Remove the directory now // Remove the directory now
fs.rmdirSync(d); fs.rmdirSync(d);
// Make sure the directory does not exist // Make sure the directory does not exist
assert(!common.fileExists(d)); assert(!fs.existsSync(d));
// Similarly test the Async version // Similarly test the Async version
fs.mkdir(d, 0o666, common.mustCall(function(err) { fs.mkdir(d, 0o666, common.mustCall(function(err) {

View File

@ -32,7 +32,7 @@ tmpdir.refresh();
fs.mkdir(pathname, common.mustCall(function(err) { fs.mkdir(pathname, common.mustCall(function(err) {
assert.strictEqual(err, null); assert.strictEqual(err, null);
assert.strictEqual(common.fileExists(pathname), true); assert.strictEqual(fs.existsSync(pathname), true);
})); }));
} }
@ -41,7 +41,7 @@ tmpdir.refresh();
fs.mkdir(pathname, 0o777, common.mustCall(function(err) { fs.mkdir(pathname, 0o777, common.mustCall(function(err) {
assert.strictEqual(err, null); assert.strictEqual(err, null);
assert.strictEqual(common.fileExists(pathname), true); assert.strictEqual(fs.existsSync(pathname), true);
})); }));
} }
@ -50,7 +50,7 @@ tmpdir.refresh();
fs.mkdirSync(pathname); fs.mkdirSync(pathname);
const exists = common.fileExists(pathname); const exists = fs.existsSync(pathname);
assert.strictEqual(exists, true); assert.strictEqual(exists, true);
} }

View File

@ -11,16 +11,16 @@ tmpdir.refresh();
const tmpFolder = fs.mkdtempSync(path.join(tmpdir.path, 'foo.')); const tmpFolder = fs.mkdtempSync(path.join(tmpdir.path, 'foo.'));
assert.strictEqual(path.basename(tmpFolder).length, 'foo.XXXXXX'.length); assert.strictEqual(path.basename(tmpFolder).length, 'foo.XXXXXX'.length);
assert(common.fileExists(tmpFolder)); assert(fs.existsSync(tmpFolder));
const utf8 = fs.mkdtempSync(path.join(tmpdir.path, '\u0222abc.')); const utf8 = fs.mkdtempSync(path.join(tmpdir.path, '\u0222abc.'));
assert.strictEqual(Buffer.byteLength(path.basename(utf8)), assert.strictEqual(Buffer.byteLength(path.basename(utf8)),
Buffer.byteLength('\u0222abc.XXXXXX')); Buffer.byteLength('\u0222abc.XXXXXX'));
assert(common.fileExists(utf8)); assert(fs.existsSync(utf8));
function handler(err, folder) { function handler(err, folder) {
assert.ifError(err); assert.ifError(err);
assert(common.fileExists(folder)); assert(fs.existsSync(folder));
assert.strictEqual(this, undefined); assert.strictEqual(this, undefined);
} }

View File

@ -47,8 +47,8 @@ fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {
fs.unlink(linkPath, common.mustCall(function(err) { fs.unlink(linkPath, common.mustCall(function(err) {
assert.ifError(err); assert.ifError(err);
assert(!common.fileExists(linkPath)); assert(!fs.existsSync(linkPath));
assert(common.fileExists(linkData)); assert(fs.existsSync(linkData));
})); }));
})); }));
})); }));

View File

@ -20,8 +20,9 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict'; 'use strict';
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const fs = require('fs');
const fixtures = require('../common/fixtures'); const fixtures = require('../common/fixtures');
// A module with an error in it should throw // A module with an error in it should throw
@ -52,5 +53,5 @@ function assertModuleNotFound(path) {
} }
function assertExists(fixture) { function assertExists(fixture) {
assert(common.fileExists(fixtures.path(fixture))); assert(fs.existsSync(fixtures.path(fixture)));
} }

View File

@ -19,7 +19,7 @@ const proc = cp.spawn(process.execPath,
[ '--trace-events-enabled', '-e', CODE ]); [ '--trace-events-enabled', '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -130,7 +130,7 @@ if (isChild) {
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
const file = path.join(tmpdir.path, 'node_trace.1.log'); const file = path.join(tmpdir.path, 'node_trace.1.log');
assert(common.fileExists(file)); assert(fs.existsSync(file));
fs.readFile(file, common.mustCall((err, data) => { fs.readFile(file, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata'); .filter((trace) => trace.cat !== '__metadata');

View File

@ -21,7 +21,7 @@ const proc = cp.spawn(process.execPath,
'-e', CODE ]); '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -32,7 +32,7 @@ const proc = cp.spawn(process.execPath,
'-e', CODE ]); '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata'); .filter((trace) => trace.cat !== '__metadata');

View File

@ -43,7 +43,7 @@ if (process.argv[2] === 'child') {
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
const file = path.join(tmpdir.path, 'node_trace.1.log'); const file = path.join(tmpdir.path, 'node_trace.1.log');
assert(common.fileExists(file)); assert(fs.existsSync(file));
fs.readFile(file, common.mustCall((err, data) => { fs.readFile(file, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata'); .filter((trace) => trace.cat !== '__metadata');

View File

@ -25,7 +25,7 @@ const proc = cp.spawn(process.execPath, [
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
const expectedFilename = `${proc.pid}-1-${proc.pid}-1.tracing.log`; const expectedFilename = `${proc.pid}-1-${proc.pid}-1.tracing.log`;
assert(common.fileExists(expectedFilename)); assert(fs.existsSync(expectedFilename));
fs.readFile(expectedFilename, common.mustCall((err, data) => { fs.readFile(expectedFilename, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -139,7 +139,7 @@ for (const tr in tests) {
assert.strictEqual(proc.status, 0, `${tr}:\n${util.inspect(proc)}`); assert.strictEqual(proc.status, 0, `${tr}:\n${util.inspect(proc)}`);
// Confirm that trace log file is created. // Confirm that trace log file is created.
assert(common.fileExists(traceFile)); assert(fs.existsSync(traceFile));
const data = fs.readFileSync(traceFile); const data = fs.readFileSync(traceFile);
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -21,7 +21,7 @@ const proc = cp.spawn(process.execPath,
'--title=bar', '--title=bar',
'-e', CODE ]); '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat === '__metadata'); .filter((trace) => trace.cat === '__metadata');

View File

@ -21,7 +21,7 @@ const proc_no_categories = cp.spawn(
); );
proc_no_categories.once('exit', common.mustCall(() => { proc_no_categories.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
// Only __metadata categories should have been emitted. // Only __metadata categories should have been emitted.
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
assert.ok(JSON.parse(data.toString()).traceEvents.every( assert.ok(JSON.parse(data.toString()).traceEvents.every(

View File

@ -50,7 +50,7 @@ if (process.argv[2] === 'child') {
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
const file = path.join(tmpdir.path, 'node_trace.1.log'); const file = path.join(tmpdir.path, 'node_trace.1.log');
assert(common.fileExists(file)); assert(fs.existsSync(file));
fs.readFile(file, common.mustCall((err, data) => { fs.readFile(file, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata'); .filter((trace) => trace.cat !== '__metadata');

View File

@ -19,7 +19,7 @@ const proc = cp.spawn(process.execPath,
'-e', 'process.exit()' ]); '-e', 'process.exit()' ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -21,7 +21,7 @@ const proc = cp.spawn(process.execPath,
'-e', CODE ]); '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -33,7 +33,7 @@ if (process.argv[2] === 'child') {
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
const file = path.join(tmpdir.path, 'node_trace.1.log'); const file = path.join(tmpdir.path, 'node_trace.1.log');
assert(common.fileExists(file)); assert(fs.existsSync(file));
fs.readFile(file, common.mustCall((err, data) => { fs.readFile(file, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata'); .filter((trace) => trace.cat !== '__metadata');

View File

@ -19,7 +19,7 @@ if (isMainThread) {
'--trace-event-categories', 'node', '--trace-event-categories', 'node',
'-e', CODE ]); '-e', CODE ]);
proc.once('exit', common.mustCall(() => { proc.once('exit', common.mustCall(() => {
assert(common.fileExists(FILE_NAME)); assert(fs.existsSync(FILE_NAME));
fs.readFile(FILE_NAME, common.mustCall((err, data) => { fs.readFile(FILE_NAME, common.mustCall((err, data) => {
const traces = JSON.parse(data.toString()).traceEvents; const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0); assert(traces.length > 0);

View File

@ -20,7 +20,7 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict'; 'use strict';
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
@ -42,14 +42,14 @@ fs.watchFile(FILENAME, { interval: TIMEOUT - 250 }, function(curr, prev) {
console.log([curr, prev]); console.log([curr, prev]);
switch (++nevents) { switch (++nevents) {
case 1: case 1:
assert.strictEqual(common.fileExists(FILENAME), false); assert.strictEqual(fs.existsSync(FILENAME), false);
break; break;
case 2: case 2:
case 3: case 3:
assert.strictEqual(common.fileExists(FILENAME), true); assert.strictEqual(fs.existsSync(FILENAME), true);
break; break;
case 4: case 4:
assert.strictEqual(common.fileExists(FILENAME), false); assert.strictEqual(fs.existsSync(FILENAME), false);
fs.unwatchFile(FILENAME); fs.unwatchFile(FILENAME);
break; break;
default: default: