From cb1c076ed1288634ed06a48641d78219a23c583b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 18 Oct 2016 11:25:02 -0700 Subject: [PATCH 1/3] test: remove duplicate required module --- test/parallel/test-setproctitle.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js index 4d096b1941865f..ea6c8a9597d4aa 100644 --- a/test/parallel/test-setproctitle.js +++ b/test/parallel/test-setproctitle.js @@ -2,7 +2,6 @@ // 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}]`); From e53bad05698353681e54457d8665258a91d34a35 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 18 Oct 2016 11:33:35 -0700 Subject: [PATCH 2/3] squash: other tweaks --- test/parallel/test-setproctitle.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js index ea6c8a9597d4aa..8af3cb329e5b3b 100644 --- a/test/parallel/test-setproctitle.js +++ b/test/parallel/test-setproctitle.js @@ -8,27 +8,27 @@ if (!(common.isFreeBSD || common.isOSX || common.isLinux)) { 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.strictEqual(error, null); + 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); }); From 6ddddb71969780d38f1342809f354a78d3898726 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 18 Oct 2016 16:23:58 -0700 Subject: [PATCH 3/3] squash: assert.ifError() --- test/parallel/test-setproctitle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js index 8af3cb329e5b3b..9dd603bfdc3327 100644 --- a/test/parallel/test-setproctitle.js +++ b/test/parallel/test-setproctitle.js @@ -22,7 +22,7 @@ process.title = title; assert.strictEqual(process.title, title); exec(`ps -p ${process.pid} -o args=`, function callback(error, stdout, stderr) { - assert.strictEqual(error, null); + assert.ifError(error); assert.strictEqual(stderr, ''); // freebsd always add ' (procname)' to the process title