From 1518cc1e70f820d4479f4a0f2f232a8d1c570fe6 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 18 Oct 2016 11:25:02 -0700 Subject: [PATCH] test: remove duplicate required module `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: https://github.com/nodejs/node/pull/9169 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- test/parallel/test-setproctitle.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js index 4d096b1941865f..9dd603bfdc3327 100644 --- a/test/parallel/test-setproctitle.js +++ b/test/parallel/test-setproctitle.js @@ -2,34 +2,33 @@ // Original test written by Jakub Lekstan 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); });