Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: refactor common.js #9732

Closed
wants to merge 1 commit into from
Closed

test: refactor common.js #9732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,6 @@ Checks if there are multiple localhosts available.

Throws an `AssertionError` with `msg`

### faketimeCli
* return [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type)

Return the path to the fake.

### fileExists(pathname)
* pathname [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type)
* return [<Boolean>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type)
Expand Down Expand Up @@ -365,12 +360,6 @@ Synchronous version of `spawnCat`.

Synchronous version of `spawnPwd`.

### testDir

* return [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type)

Path to the 'test' directory.

### tmpDir
* return [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type)

Expand Down
47 changes: 21 additions & 26 deletions test/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ const Timer = process.binding('timer_wrap').Timer;
const testRoot = process.env.NODE_TEST_DIR ?
path.resolve(process.env.NODE_TEST_DIR) : __dirname;

exports.testDir = __dirname;
exports.fixturesDir = path.join(exports.testDir, 'fixtures');
exports.fixturesDir = path.join(__dirname, 'fixtures');
exports.tmpDirName = 'tmp';
// PORT should match the definition in test/testpy/__init__.py.
exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
Expand Down Expand Up @@ -195,13 +194,6 @@ if (exports.isWindows) {
exports.PIPE = exports.tmpDir + '/test.sock';
}

if (exports.isWindows) {
exports.faketimeCli = false;
} else {
exports.faketimeCli = path.join(__dirname, '..', 'tools', 'faketime', 'src',
'faketime');
}

var ifaces = os.networkInterfaces();
exports.hasIPv6 = Object.keys(ifaces).some(function(name) {
return /lo/.test(name) && ifaces[name].some(function(info) {
Expand Down Expand Up @@ -285,17 +277,19 @@ exports.platformTimeout = function(ms) {
return ms; // ARMv8+
};

var knownGlobals = [setTimeout,
setInterval,
setImmediate,
clearTimeout,
clearInterval,
clearImmediate,
console,
constructor, // Enumerable in V8 3.21.
Buffer,
process,
global];
var knownGlobals = [
Buffer,
clearImmediate,
clearInterval,
clearTimeout,
console,
constructor, // Enumerable in V8 3.21.
global,
process,
setImmediate,
setInterval,
setTimeout
];

if (global.gc) {
knownGlobals.push(global.gc);
Expand Down Expand Up @@ -360,7 +354,7 @@ function leakedGlobals() {
var leaked = [];

for (var val in global)
if (-1 === knownGlobals.indexOf(global[val]))
if (!knownGlobals.includes(global[val]))
leaked.push(val);

return leaked;
Expand All @@ -375,7 +369,7 @@ process.on('exit', function() {
var leaked = leakedGlobals();
if (leaked.length > 0) {
console.error('Unknown globals: %s', leaked);
assert.ok(false, 'Unknown global found');
fail('Unknown global found');
}
});

Expand Down Expand Up @@ -440,9 +434,10 @@ exports.fileExists = function(pathname) {
}
};

exports.fail = function(msg) {
function fail(msg) {
assert.fail(null, null, msg);
};
}
exports.fail = fail;

exports.skip = function(msg) {
console.log(`1..0 # Skipped: ${msg}`);
Expand Down Expand Up @@ -493,9 +488,9 @@ exports.nodeProcessAborted = function nodeProcessAborted(exitCode, signal) {
// one of them (exit code or signal) needs to be set to one of
// the expected exit codes or signals.
if (signal !== null) {
return expectedSignals.indexOf(signal) > -1;
return expectedSignals.includes(signal);
} else {
return expectedExitCodes.indexOf(exitCode) > -1;
return expectedExitCodes.includes(exitCode);
}
};

Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-npm-install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ const installDir = path.join(common.tmpDir, 'install-dir');
fs.mkdirSync(installDir);

const npmPath = path.join(
common.testDir,
__dirname,
'..',
'..',
'deps',
'npm',
Expand Down