Skip to content

Commit

Permalink
test: remove duplicate required module
Browse files Browse the repository at this point in the history
`common` is required twice in test-setproctitle.js. Remove one of the
instances.

Other refactoring:

* var -> const and let
* assert.equal -> assert.strictEqual
* assert.notEqual -> assert.notStrickEqual
* string concatenation -> template string
* use of assert.ifError() instead of asserting error is null

PR-URL: nodejs#9169
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott committed Oct 21, 2016
1 parent da184f4 commit 3184285
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions test/parallel/test-setproctitle.js
Expand Up @@ -2,34 +2,33 @@
// Original test written by Jakub Lekstan <kuebzky@gmail.com>
const common = require('../common');

require('../common');
// FIXME add sunos support
if (!(common.isFreeBSD || common.isOSX || common.isLinux)) {
console.log(`1..0 # Skipped: Unsupported platform [${process.platform}]`);
return;
}

var assert = require('assert');
var exec = require('child_process').exec;
var path = require('path');
const assert = require('assert');
const exec = require('child_process').exec;
const path = require('path');

// The title shouldn't be too long; libuv's uv_set_process_title() out of
// security considerations no longer overwrites envp, only argv, so the
// maximum title length is possibly quite short.
var title = 'testme';
let title = 'testme';

assert.notEqual(process.title, title);
assert.notStrictEqual(process.title, title);
process.title = title;
assert.equal(process.title, title);
assert.strictEqual(process.title, title);

exec('ps -p ' + process.pid + ' -o args=', function(error, stdout, stderr) {
assert.equal(error, null);
assert.equal(stderr, '');
exec(`ps -p ${process.pid} -o args=`, function callback(error, stdout, stderr) {
assert.ifError(error);
assert.strictEqual(stderr, '');

// freebsd always add ' (procname)' to the process title
if (common.isFreeBSD)
title += ` (${path.basename(process.execPath)})`;

// omitting trailing whitespace and \n
assert.equal(stdout.replace(/\s+$/, ''), title);
assert.strictEqual(stdout.replace(/\s+$/, ''), title);
});

0 comments on commit 3184285

Please sign in to comment.