Text Compare

Text Compare
Produced: 21/06/2017 08:46:11

Mode: Differences, With Context, Ignoring Unimportant
Left file: C:\code\12735.diff Right file: C:\code\13835.diff

- 'require(\'' + buildPath + '\')' +	=	- 'require(\'' + buildPath + '\')' +
+ `require('${buildPath}')` +		+ `require('${buildPath}')` +
// Log output to double check callback ran.		// Log output to double check callback ran.
'.method(function() { console.log(\'cb_ran\'); });',		'.method(function() { console.log(\'cb_ran\'); });',
];		];
diff --git a/test/common/index.js b/test/common/index.js		diff --git a/test/common/index.js b/test/common/index.js
index 3b707a93baa..a10adc4d0d6 100644		index 08cef515089..f004014a024 100644
--- a/test/common/index.js		--- a/test/common/index.js
+++ b/test/common/index.js		+++ b/test/common/index.js
@@ -55,9 +55,8 @@ exports.isLinux = process.platform === 'linux';
exports.isOSX = process.platform === 'darwin';	+-
	=
exports.enoughTestMem = os.totalmem() > 0x40000000; /* 1 Gb */	+-
-exports.bufferMaxSizeMsg = new RegExp('^RangeError: "size" argument' +
- ' must not be larger than ' +
- buffer.kMaxLength + '$');
+exports.bufferMaxSizeMsg = new RegExp(
+ `^RangeError: "size" argument must not be larger than ${buffer.kMaxLength}$`);
const cpus = os.cpus();
exports.enoughTestCpu = Array.isArray(cpus) &&
(cpus.length > 1 \|\| cpus[0].speed > 999);
@@ -118,7 +117,7 @@ exports.refreshTmpDir = function() {	=	@@ -90,7 +90,7 @@ exports.refreshTmpDir = function() {

if (process.env.TEST_THREAD_ID) {		if (process.env.TEST_THREAD_ID) {
exports.PORT += process.env.TEST_THREAD_ID * 100;		exports.PORT += process.env.TEST_THREAD_ID * 100;
- exports.tmpDirName += '.' + process.env.TEST_THREAD_ID;		- exports.tmpDirName += '.' + process.env.TEST_THREAD_ID;
+ exports.tmpDirName += `.${process.env.TEST_THREAD_ID}`;		+ exports.tmpDirName += `.${process.env.TEST_THREAD_ID}`;
}		}
exports.tmpDir = path.join(testRoot, exports.tmpDirName);		exports.tmpDir = path.join(testRoot, exports.tmpDirName);

@@ -217,10 +216,10 @@ Object.defineProperty(exports, 'hasFipsCrypto', {		@@ -189,10 +189,10 @@ Object.defineProperty(exports, 'hasFipsCrypto', {

- return '"' + process.argv[0] + '" "' + p + '" "' +	=	- return '"' + process.argv[0] + '" "' + p + '" "' +
- filename + '" ' + (kilobytes * 1024);		- filename + '" ' + (kilobytes * 1024);
+ return `"${process.argv[0]}" "${p}" "${filename}" ${kilobytes * 1024}`;		+ return `"${process.argv[0]}" "${p}" "${filename}" ${kilobytes * 1024}`;
} else {		} else {
- return 'dd if=/dev/zero of="' + filename + '" bs=1024 count=' + kilobytes;		- return 'dd if=/dev/zero of="' + filename + '" bs=1024 count=' + kilobytes;
+ return `dd if=/dev/zero of="${filename}" bs=1024 count=${kilobytes}`;		+ return `dd if=/dev/zero of="${filename}" bs=1024 count=${kilobytes}`;
}		}
};		};

@@ -495,7 +493,7 @@ exports.canCreateSymLink = function() {
let output = '';	+-
	=
try {	+-
- output = execSync(whoamiPath + ' /priv', { timout: 1000 });
+ output = execSync(`${whoamiPath} /priv`, { timout: 1000 });
} catch (e) {
err = true;
} finally {
@@ -522,7 +520,7 @@ exports.skip = function(msg) {	=	@@ -478,7 +477,7 @@ exports.skip = function(msg) {
function ArrayStream() {		function ArrayStream() {
this.run = function(data) {		this.run = function(data) {
data.forEach((line) => {		data.forEach((line) => {
- this.emit('data', line + '\n');		- this.emit('data', line + '\n');
+ this.emit('data', `${line}\n`);		+ this.emit('data', `${line}\n`);
});		});
};		};
}		}
diff --git a/test/debugger/helper-debugger-repl.js b/test/debugger/helper-debugger-repl.js		diff --git a/test/debugger/helper-debugger-repl.js b/test/debugger/helper-debugger-repl.js

if (id === this.lastId_) {	=	if (id === this.lastId_) {
this.lastMessageResponseCallback_ && this.lastMessageResponseCallback_();		this.lastMessageResponseCallback_ && this.lastMessageResponseCallback_();
@@ -213,12 +215,8 @@ TestSession.prototype.sendInspectorCommands = function(commands) {		@@ -211,12 +213,8 @@ TestSession.prototype.sendInspectorCommands = function(commands) {
};		};
this.sendAll_(commands, () => {		this.sendAll_(commands, () => {
timeoutId = setTimeout(() => {		timeoutId = setTimeout(() => {
- let s = '';		- let s = '';
- for (const id in this.messages_) {		- for (const id in this.messages_) {
- s += id + ', ';		- s += id + ', ';
- }		- }
- assert.fail('Messages without response: ' +	<>	- common.fail('Messages without response: ' +
- s.substring(0, s.length - 2));	=	- s.substring(0, s.length - 2));
+ assert.fail(`Messages without response: ${	<>	+ common.fail(`Messages without response: ${
+ Object.keys(this.messages_).join(', ')}`);	=	+ Object.keys(this.messages_).join(', ')}`);
}, TIMEOUT);		}, TIMEOUT);
});		});
});		});
@@ -241,7 +239,7 @@ TestSession.prototype.expectMessages = function(expects) {		@@ -239,7 +237,7 @@ TestSession.prototype.expectMessages = function(expects) {
if (!(expects instanceof Array)) expects = [ expects ];		if (!(expects instanceof Array)) expects = [ expects ];

const callback = this.createCallbackWithTimeout_(		const callback = this.createCallbackWithTimeout_(
- 'Matching response was not received:\n' + expects[0]);		- 'Matching response was not received:\n' + expects[0]);
+ `Matching response was not received:\n${expects[0]}`);		+ `Matching response was not received:\n${expects[0]}`);

@@ -36,7 +36,7 @@ function expectMainScriptSource(result) {	=	@@ -35,7 +35,7 @@ function expectMainScriptSource(result) {
const expected = helper.mainScriptSource();		const expected = helper.mainScriptSource();
const source = result['scriptSource'];		const source = result['scriptSource'];
assert(source && (source.includes(expected)),		assert(source && (source.includes(expected)),
- 'Script source is wrong: ' + source);		- 'Script source is wrong: ' + source);
+ `Script source is wrong: ${source}`);		+ `Script source is wrong: ${source}`);
}		}

function setupExpectBreakOnLine(line, url, session, scopeIdCallback) {		function setupExpectBreakOnLine(line, url, session, scopeIdCallback) {
@@ -187,7 +187,7 @@ function testI18NCharacters(session) {
{	+-
'method': 'Debugger.evaluateOnCallFrame', 'params': {
'callFrameId': '{"ordinal":0,"injectedScriptId":1}',
- 'expression': 'console.log("' + chars + '")',
+ 'expression': `console.log("${chars}")`,
'objectGroup': 'console',
'includeCommandLineAPI': true,
'silent': false,
diff --git a/test/internet/test-dns-cares-domains.js b/test/internet/test-dns-cares-domains.js	=	diff --git a/test/internet/test-dns-cares-domains.js b/test/internet/test-dns-cares-domains.js
index 5328d7e3d97..62c1847ea29 100644		index 5328d7e3d97..62c1847ea29 100644
--- a/test/internet/test-dns-cares-domains.js		--- a/test/internet/test-dns-cares-domains.js
+++ b/test/internet/test-dns-cares-domains.js		+++ b/test/internet/test-dns-cares-domains.js
@@ -21,7 +21,7 @@ methods.forEach(function(method) {		@@ -21,7 +21,7 @@ methods.forEach(function(method) {
const d = domain.create();		const d = domain.create();
d.run(function() {		d.run(function() {
dns[method]('google.com', function() {		dns[method]('google.com', function() {
- assert.strictEqual(process.domain, d, method + ' retains domain');		- assert.strictEqual(process.domain, d, method + ' retains domain');
+ assert.strictEqual(process.domain, d, `${method} retains domain`);		+ assert.strictEqual(process.domain, d, `${method} retains domain`);

+++ b/test/internet/test-tls-add-ca-cert.js	=	+++ b/test/internet/test-tls-add-ca-cert.js
@@ -13,7 +13,7 @@ const fs = require('fs');		@@ -13,7 +13,7 @@ const fs = require('fs');
const tls = require('tls');		const tls = require('tls');

function filenamePEM(n) {		function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', n + '.pem');		- return require('path').join(common.fixturesDir, 'keys', n + '.pem');
+ return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);		+ return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
}		}

function loadPEM(n) {		function loadPEM(n) {
diff --git a/test/known_issues/test-cwd-enoent-file.js b/test/known_issues/test-cwd-enoent-file.js	+-
index 3a5094eb398..9431919804a 100644	=
--- a/test/known_issues/test-cwd-enoent-file.js	+-
+++ b/test/known_issues/test-cwd-enoent-file.js
@@ -19,7 +19,7 @@ if (process.argv[2] === 'child') {	=
// Do nothing.	+-
} else {
common.refreshTmpDir();
- const dir = fs.mkdtempSync(common.tmpDir + '/');
+ const dir = fs.mkdtempSync(`${common.tmpDir}/`);
process.chdir(dir);
fs.rmdirSync(dir);
assert.throws(process.cwd,
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js	=	diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index 639439bca59..8772d997f08 100644		index de6d0387042..3a81c6f8104 100644
--- a/test/parallel/test-assert.js		--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js		+++ b/test/parallel/test-assert.js
@@ -177,7 +177,7 @@ assert.doesNotThrow(makeBlock(a.deepEqual, a1, a2));		@@ -139,7 +139,7 @@ assert.doesNotThrow(makeBlock(a.deepEqual, a1, a2));

// having an identical prototype property		// having an identical prototype property
const nbRoot = {		const nbRoot = {
- toString: function() { return this.first + ' ' + this.last; }		- toString: function() { return this.first + ' ' + this.last; }
+ toString: function() { return `${this.first} ${this.last}`; }		+ toString: function() { return `${this.first} ${this.last}`; }

+++ b/test/parallel/test-async-wrap-check-providers.js	=	+++ b/test/parallel/test-async-wrap-check-providers.js
@@ -94,8 +94,8 @@ process.on('SIGINT', () => process.exit());		@@ -91,8 +91,8 @@ process.on('SIGINT', () => process.exit());
// Run from closed net server above.		// Run from closed net server above.
function checkTLS() {		function checkTLS() {
const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/ec-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/ec-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/ec-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/ec-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)
};		};
const server = tls.createServer(options, common.noop)	<>	const server = tls.createServer(options, noop)
.listen(0, function() {	=	.listen(0, function() {
diff --git a/test/parallel/test-buffer-badhex.js b/test/parallel/test-buffer-badhex.js		diff --git a/test/parallel/test-buffer-badhex.js b/test/parallel/test-buffer-badhex.js
index ad0b5133958..c3d151ba18c 100644		index ad0b5133958..c3d151ba18c 100644
--- a/test/parallel/test-buffer-badhex.js		--- a/test/parallel/test-buffer-badhex.js
+++ b/test/parallel/test-buffer-badhex.js		+++ b/test/parallel/test-buffer-badhex.js
@@ -44,6 +44,6 @@ const Buffer = require('buffer').Buffer;		@@ -44,6 +44,6 @@ const Buffer = require('buffer').Buffer;
const hex = buf.toString('hex');		const hex = buf.toString('hex');
assert.deepStrictEqual(Buffer.from(hex, 'hex'), buf);		assert.deepStrictEqual(Buffer.from(hex, 'hex'), buf);

- const badHex = hex.slice(0, 256) + 'xx' + hex.slice(256, 510);		- const badHex = hex.slice(0, 256) + 'xx' + hex.slice(256, 510);

index 5177a19f1a1..72654f488ea 100644	=	index 36864cbd663..587c7e2c596 100644
--- a/test/parallel/test-child-process-fork.js		--- a/test/parallel/test-child-process-fork.js
+++ b/test/parallel/test-child-process-fork.js		+++ b/test/parallel/test-child-process-fork.js
@@ -25,7 +25,7 @@ const assert = require('assert');		@@ -4,7 +4,7 @@ const assert = require('assert');
const fork = require('child_process').fork;		const fork = require('child_process').fork;
const args = ['foo', 'bar'];		const args = ['foo', 'bar'];

-const n = fork(common.fixturesDir + '/child-process-spawn-node.js', args);		-const n = fork(common.fixturesDir + '/child-process-spawn-node.js', args);
+const n = fork(`${common.fixturesDir}/child-process-spawn-node.js`, args);		+const n = fork(`${common.fixturesDir}/child-process-spawn-node.js`, args);

assert.strictEqual(n.channel, n._channel);	+-
assert.deepStrictEqual(args, ['foo', 'bar']);	=	assert.deepStrictEqual(args, ['foo', 'bar']);

	-+	n.on('message', function(m) {
diff --git a/test/parallel/test-child-process-fork3.js b/test/parallel/test-child-process-fork3.js	=	diff --git a/test/parallel/test-child-process-fork3.js b/test/parallel/test-child-process-fork3.js
index cffcf2128fb..dab689da0ce 100644		index 5588c41422e..ecd43ab56d3 100644
--- a/test/parallel/test-child-process-fork3.js		--- a/test/parallel/test-child-process-fork3.js
+++ b/test/parallel/test-child-process-fork3.js		+++ b/test/parallel/test-child-process-fork3.js
@@ -23,4 +23,4 @@		@@ -2,4 +2,4 @@
const common = require('../common');		const common = require('../common');
const child_process = require('child_process');		const child_process = require('child_process');

-child_process.fork(common.fixturesDir + '/empty.js'); // should not hang		-child_process.fork(common.fixturesDir + '/empty.js'); // should not hang
+child_process.fork(`${common.fixturesDir}/empty.js`); // should not hang		+child_process.fork(`${common.fixturesDir}/empty.js`); // should not hang

- assert.strictEqual(err.syscall, 'spawn ' + enoentPath);	=	- assert.strictEqual(err.syscall, 'spawn ' + enoentPath);
+ assert.strictEqual(err.syscall, `spawn ${enoentPath}`);		+ assert.strictEqual(err.syscall, `spawn ${enoentPath}`);
assert.strictEqual(err.path, enoentPath);		assert.strictEqual(err.path, enoentPath);
assert.deepStrictEqual(err.spawnargs, spawnargs);		assert.deepStrictEqual(err.spawnargs, spawnargs);
}));		}));
diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js		diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js
index cf5884b38ff..93b26107a72 100644		index 5fa8ec1604c..28048449014 100644
--- a/test/parallel/test-child-process-spawn-typeerror.js		--- a/test/parallel/test-child-process-spawn-typeerror.js
+++ b/test/parallel/test-child-process-spawn-typeerror.js		+++ b/test/parallel/test-child-process-spawn-typeerror.js
		@@ -9,7 +9,7 @@ const cmd = common.isWindows ? 'rundll32' : 'ls';
	<>	const invalidcmd = 'hopefully_you_dont_have_this_on_your_machine';
@@ -32,7 +32,7 @@ const invalidArgsMsg = /Incorrect value of args option/;		const invalidArgsMsg = /Incorrect value of args option/;
const invalidOptionsMsg = /"options" argument must be an object/;	=	const invalidOptionsMsg = /"options" argument must be an object/;
const invalidFileMsg =	+-
/^TypeError: "file" argument must be a non-empty string$/;
-const empty = common.fixturesDir + '/empty.js';	=	-const empty = common.fixturesDir + '/empty.js';
+const empty = `${common.fixturesDir}/empty.js`;		+const empty = `${common.fixturesDir}/empty.js`;

assert.throws(function() {		assert.throws(function() {
const child = spawn(invalidcmd, 'this is not an array');		const child = spawn(invalidcmd, 'this is not an array');
diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js		diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
index 5b9f418cf76..b44c2363847 100644		index 5e1de1c616c..466a859c663 100644
--- a/test/parallel/test-child-process-spawnsync-input.js		--- a/test/parallel/test-child-process-spawnsync-input.js
+++ b/test/parallel/test-child-process-spawnsync-input.js		+++ b/test/parallel/test-child-process-spawnsync-input.js
@@ -30,8 +30,8 @@ const msgOut = 'this is stdout';		@@ -9,8 +9,8 @@ const msgOut = 'this is stdout';

}));	=	}));
@@ -222,7 +222,7 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,		@@ -201,7 +201,7 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
// filename.		// filename.
const filecmd = `${nodejs} -- ${__filename} ${args}`;		const filecmd = `${nodejs} -- ${__filename} ${args}`;
child.exec(filecmd, common.mustCall(function(err, stdout, stderr) {		child.exec(filecmd, common.mustCall(function(err, stdout, stderr) {
- assert.strictEqual(stdout, args + '\n');		- assert.strictEqual(stdout, args + '\n');
+ assert.strictEqual(stdout, `${args}\n`);		+ assert.strictEqual(stdout, `${args}\n`);
assert.strictEqual(stderr, '');		assert.strictEqual(stderr, '');
assert.strictEqual(err, null);		assert.strictEqual(err, null);
}));		}));
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js	+-
index 47fd4b85c7c..6b0b9f53f9a 100644	=
--- a/test/parallel/test-cli-node-options.js	+-
+++ b/test/parallel/test-cli-node-options.js
@@ -31,8 +31,7 @@ function disallow(opt) {	=
const options = {env: {NODE_OPTIONS: opt}};	+-
exec(process.execPath, options, common.mustCall(function(err) {
const message = err.message.split(/\r?\n/)[1];
- const expect = process.execPath + ': ' + opt +
- ' is not allowed in NODE_OPTIONS';
+ const expect = `${process.execPath}: ${opt} is not allowed in NODE_OPTIONS`;
	=
assert.strictEqual(err.code, 9);	+-
assert.strictEqual(message, expect);
@@ -41,7 +40,7 @@ function disallow(opt) {	=

const printA = require.resolve('../fixtures/printA.js');	+-
	=
-expect('-r ' + printA, 'A\nB\n');	+-
+expect(`-r ${printA}`, 'A\nB\n');
expect('--no-deprecation', 'B\n');
expect('--no-warnings', 'B\n');
expect('--trace-warnings', 'B\n');
@@ -75,7 +74,7 @@ function expect(opt, want) {	=
if (!RegExp(want).test(stdout)) {	+-
console.error('For %j, failed to find %j in: <\n%s\n>',
opt, expect, stdout);
- assert(false, 'Expected ' + expect);
+ assert(false, `Expected ${expect}`);
}
}));
}
diff --git a/test/parallel/test-cli-syntax.js b/test/parallel/test-cli-syntax.js	=	diff --git a/test/parallel/test-cli-syntax.js b/test/parallel/test-cli-syntax.js
index 5698d86ea49..eda45701a5f 100644		index d7781eddffb..1986c117ab6 100644
--- a/test/parallel/test-cli-syntax.js		--- a/test/parallel/test-cli-syntax.js
+++ b/test/parallel/test-cli-syntax.js		+++ b/test/parallel/test-cli-syntax.js
@@ -31,7 +31,7 @@ const syntaxArgs = [		@@ -31,7 +31,7 @@ const syntaxArgs = [
// no output should be produced		// no output should be produced
assert.strictEqual(c.stdout, '', 'stdout produced');		assert.strictEqual(c.stdout, '', 'stdout produced');
assert.strictEqual(c.stderr, '', 'stderr produced');		assert.strictEqual(c.stderr, '', 'stderr produced');
- assert.strictEqual(c.status, 0, 'code === ' + c.status);	<>	- assert.strictEqual(c.status, 0, 'code == ' + c.status);
+ assert.strictEqual(c.status, 0, `code === ${c.status}`);		+ assert.strictEqual(c.status, 0, `code == ${c.status}`);
});	=	});
});		});

@@ -59,7 +59,7 @@ const syntaxArgs = [		@@ -56,7 +56,7 @@ const syntaxArgs = [
const match = c.stderr.match(/^SyntaxError: Unexpected identifier$/m);		const match = c.stderr.match(/^SyntaxError: Unexpected identifier$/m);
assert(match, 'stderr incorrect');		assert(match, 'stderr incorrect');

- assert.strictEqual(c.status, 1, 'code === ' + c.status);	<>	- assert.strictEqual(c.status, 1, 'code == ' + c.status);
+ assert.strictEqual(c.status, 1, `code === ${c.status}`);		+ assert.strictEqual(c.status, 1, `code == ${c.status}`);
});	=	});
});		});

@@ -82,7 +82,7 @@ const syntaxArgs = [		@@ -79,6 +79,6 @@ const syntaxArgs = [
const match = c.stderr.match(/^Error: Cannot find module/m);		const match = c.stderr.match(/^Error: Cannot find module/m);
assert(match, 'stderr incorrect');		assert(match, 'stderr incorrect');

- assert.strictEqual(c.status, 1, 'code === ' + c.status);	<>	- assert.strictEqual(c.status, 1, 'code == ' + c.status);
+ assert.strictEqual(c.status, 1, `code === ${c.status}`);		+ assert.strictEqual(c.status, 1, `code == ${c.status}`);
});	=	});
});		});

@@ -96,7 +96,7 @@ syntaxArgs.forEach(function(args) {
assert.strictEqual(c.stdout, '', 'stdout produced');	+-
assert.strictEqual(c.stderr, '', 'stderr produced');
	=
- assert.strictEqual(c.status, 0, 'code === ' + c.status);	+-
+ assert.strictEqual(c.status, 0, `code === ${c.status}`);
});
	=
// should throw if code piped from stdin with --check has bad syntax	+-
@@ -115,7 +115,7 @@ syntaxArgs.forEach(function(args) {	=
const match = c.stderr.match(/^SyntaxError: Unexpected identifier$/m);	+-
assert(match, 'stderr incorrect');
	=
- assert.strictEqual(c.status, 1, 'code === ' + c.status);	+-
+ assert.strictEqual(c.status, 1, `code === ${c.status}`);
});
	=
// should throw if -c and -e flags are both passed	+-
@@ -130,6 +130,6 @@ syntaxArgs.forEach(function(args) {	=
)	+-
);
	=
- assert.strictEqual(c.status, 9, 'code === ' + c.status);	+-
+ assert.strictEqual(c.status, 9, `code === ${c.status}`);
});
});
diff --git a/test/parallel/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js	=	diff --git a/test/parallel/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js
index 5b1ecdb4c29..1fde246525e 100644		index af3e89e05ce..11384d8df93 100644
--- a/test/parallel/test-cluster-bind-twice.js		--- a/test/parallel/test-cluster-bind-twice.js
+++ b/test/parallel/test-cluster-bind-twice.js		+++ b/test/parallel/test-cluster-bind-twice.js
@@ -54,14 +54,14 @@ if (!id) {		@@ -33,14 +33,14 @@ if (!id) {
a.on('exit', common.mustCall((c) => {		a.on('exit', common.mustCall((c) => {
if (c) {		if (c) {
b.send('QUIT');		b.send('QUIT');
- throw new Error('A exited with ' + c);		- throw new Error('A exited with ' + c);
+ throw new Error(`A exited with ${c}`);		+ throw new Error(`A exited with ${c}`);

if (id === 'undefined') {	=	if (id === 'undefined') {
const server = net.createServer(common.mustNotCall());		const server = net.createServer(common.mustNotCall());
diff --git a/test/parallel/test-cluster-message.js b/test/parallel/test-cluster-message.js		diff --git a/test/parallel/test-cluster-message.js b/test/parallel/test-cluster-message.js
index df9f8ca2a4a..48bd7ee36ad 100644		index 6583a68299f..57fb8eb59c7 100644
--- a/test/parallel/test-cluster-message.js		--- a/test/parallel/test-cluster-message.js
+++ b/test/parallel/test-cluster-message.js		+++ b/test/parallel/test-cluster-message.js
@@ -123,7 +123,7 @@ if (cluster.isWorker) {		@@ -102,7 +102,7 @@ if (cluster.isWorker) {
if (data.code === 'received message') {		if (data.code === 'received message') {
check('worker', data.echo === 'message from master');		check('worker', data.echo === 'message from master');
} else {		} else {
- throw new Error('wrong TCP message received: ' + data);	<>	- throw new Error('wrong TCP message recived: ' + data);
+ throw new Error(`wrong TCP message received: ${data}`);	=	+ throw new Error(`wrong TCP message received: ${data}`);
}		}
});		});

@@ -139,9 +139,8 @@ if (cluster.isWorker) {		@@ -118,9 +118,8 @@ if (cluster.isWorker) {

process.once('exit', function() {		process.once('exit', function() {
forEach(checks, function(check, type) {		forEach(checks, function(check, type) {
- assert.ok(check.receive, 'The ' + type + ' did not receive any message');		- assert.ok(check.receive, 'The ' + type + ' did not receive any message');
- assert.ok(check.correct,		- assert.ok(check.correct,

- ' [pid:' + child.pid + '] OK.');	=	- ' [pid:' + child.pid + '] OK.');
+ console.error(`Child #${++num_children_ok} [pid:${child.pid}] OK.`);		+ console.error(`Child #${++num_children_ok} [pid:${child.pid}] OK.`);
}		}

function responseHandler(buffer, expectedOutput) {		function responseHandler(buffer, expectedOutput) {
diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js		diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js
index dabdac34332..daa818705b8 100644		index 47dc68e7131..5189da15174 100644
--- a/test/parallel/test-crypto-rsa-dsa.js		--- a/test/parallel/test-crypto-rsa-dsa.js
+++ b/test/parallel/test-crypto-rsa-dsa.js		+++ b/test/parallel/test-crypto-rsa-dsa.js
@@ -10,21 +10,19 @@ if (!common.hasCrypto) {		@@ -10,21 +10,19 @@ if (!common.hasCrypto) {
const constants = require('crypto').constants;	<>	}
const crypto = require('crypto');	=	const crypto = require('crypto');

+const fixtDir = common.fixturesDir;		+const fixtDir = common.fixturesDir;
+		+
// Test certificates		// Test certificates
-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');		-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
-const keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');		-const keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');
-const rsaPubPem = fs.readFileSync(common.fixturesDir + '/test_rsa_pubkey.pem',		-const rsaPubPem = fs.readFileSync(common.fixturesDir + '/test_rsa_pubkey.pem',
- 'ascii');		- 'ascii');
-const rsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_rsa_privkey.pem',		-const rsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_rsa_privkey.pem',

- 'ascii');	=	- 'ascii');
-const dsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_dsa_privkey.pem',		-const dsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_dsa_privkey.pem',
- 'ascii');		- 'ascii');
+ `${fixtDir}/test_rsa_privkey_encrypted.pem`, 'ascii');		+ `${fixtDir}/test_rsa_privkey_encrypted.pem`, 'ascii');
+const dsaPubPem = fs.readFileSync(`${fixtDir}/test_dsa_pubkey.pem`, 'ascii');		+const dsaPubPem = fs.readFileSync(`${fixtDir}/test_dsa_pubkey.pem`, 'ascii');
+const dsaKeyPem = fs.readFileSync(`${fixtDir}/test_dsa_privkey.pem`, 'ascii');		+const dsaKeyPem = fs.readFileSync(`${fixtDir}/test_dsa_privkey.pem`, 'ascii');
const dsaKeyPemEncrypted = fs.readFileSync(		const dsaKeyPemEncrypted = fs.readFileSync(
- common.fixturesDir + '/test_dsa_privkey_encrypted.pem', 'ascii');		- common.fixturesDir + '/test_dsa_privkey_encrypted.pem', 'ascii');
+ `${fixtDir}/test_dsa_privkey_encrypted.pem`, 'ascii');		+ `${fixtDir}/test_dsa_privkey_encrypted.pem`, 'ascii');

const decryptError =	<>
/^Error: error:06065064:digital envelope routines:EVP_DecryptFinal_ex:bad decrypt$/;		const decryptError = new RegExp('^Error: error:06065064:digital envelope ' +
		'routines:EVP_DecryptFinal_ex:bad decrypt$');
@@ -178,11 +176,9 @@ assert.throws(() => {	=	@@ -178,11 +176,9 @@ assert.throws(() => {
// Test RSA signing and verification		// Test RSA signing and verification
//		//
{		{
- const privateKey = fs.readFileSync(		- const privateKey = fs.readFileSync(
- common.fixturesDir + '/test_rsa_privkey_2.pem');		- common.fixturesDir + '/test_rsa_privkey_2.pem');
+ const privateKey = fs.readFileSync(`${fixtDir}/test_rsa_privkey_2.pem`);		+ const privateKey = fs.readFileSync(`${fixtDir}/test_rsa_privkey_2.pem`);

- const publicKey = fs.readFileSync(		- const publicKey = fs.readFileSync(
- common.fixturesDir + '/test_rsa_pubkey_2.pem');		- common.fixturesDir + '/test_rsa_pubkey_2.pem');

--- a/test/parallel/test-crypto-sign-verify.js	=	--- a/test/parallel/test-crypto-sign-verify.js
+++ b/test/parallel/test-crypto-sign-verify.js		+++ b/test/parallel/test-crypto-sign-verify.js
@@ -12,8 +12,8 @@ if (!common.hasCrypto) {		@@ -10,8 +10,8 @@ if (!common.hasCrypto) {
const crypto = require('crypto');		const crypto = require('crypto');

// Test certificates		// Test certificates
-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');		-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
-const keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');		-const keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');
+const certPem = fs.readFileSync(`${common.fixturesDir}/test_cert.pem`, 'ascii');		+const certPem = fs.readFileSync(`${common.fixturesDir}/test_cert.pem`, 'ascii');
+const keyPem = fs.readFileSync(`${common.fixturesDir}/test_key.pem`, 'ascii');		+const keyPem = fs.readFileSync(`${common.fixturesDir}/test_key.pem`, 'ascii');
const modSize = 1024;	+-
	=
// Test signing and verifying		// Test signing and verifying
@@ -265,10 +265,10 @@ const modSize = 1024;
const msgfile = path.join(common.tmpDir, 's5.msg');	<>
fs.writeFileSync(msgfile, msg);
		{
- const cmd = '"' + common.opensslCli + '" dgst -sha256 -verify "' + pubfile +
- '" -signature "' + sigfile +
- '" -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-2 "' +
- msgfile + '"';
+ const cmd =
+ `"${common.opensslCli}" dgst -sha256 -verify "${pubfile}" -signature "${
+ sigfile}" -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-2 "${
+ msgfile}"`;
	=
exec(cmd, common.mustCall((err, stdout, stderr) => {	+-
assert(stdout.includes('Verified OK'));
diff --git a/test/parallel/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js	=	diff --git a/test/parallel/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js
index 7255410935d..1b3622fe01e 100644		index 7e11522f6dd..c21858b16a1 100644
--- a/test/parallel/test-crypto-verify-failure.js		--- a/test/parallel/test-crypto-verify-failure.js
+++ b/test/parallel/test-crypto-verify-failure.js		+++ b/test/parallel/test-crypto-verify-failure.js
@@ -33,11 +33,11 @@ crypto.DEFAULT_ENCODING = 'buffer';		@@ -12,11 +12,11 @@ crypto.DEFAULT_ENCODING = 'buffer';

const fs = require('fs');		const fs = require('fs');

-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');		-const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
+const certPem = fs.readFileSync(`${common.fixturesDir}/test_cert.pem`, 'ascii');		+const certPem = fs.readFileSync(`${common.fixturesDir}/test_cert.pem`, 'ascii');

- 'b not pushed: ' + names(domain._stack));	=	- 'b not pushed: ' + names(domain._stack));
+ `b not pushed: ${names(domain._stack)}`);		+ `b not pushed: ${names(domain._stack)}`);
diff --git a/test/parallel/test-domain-uncaught-exception.js b/test/parallel/test-domain-uncaught-exception.js		diff --git a/test/parallel/test-domain-uncaught-exception.js b/test/parallel/test-domain-uncaught-exception.js
index b4a3d0d1d92..2a157f9398b 100644		index 58df4ac59a7..594cee542f8 100644
--- a/test/parallel/test-domain-uncaught-exception.js		--- a/test/parallel/test-domain-uncaught-exception.js
+++ b/test/parallel/test-domain-uncaught-exception.js		+++ b/test/parallel/test-domain-uncaught-exception.js
@@ -184,16 +184,15 @@ if (process.argv[2] === 'child') {		@@ -184,17 +184,15 @@ if (process.argv[2] === 'child') {
test.expectedMessages.forEach(function(expectedMessage) {		test.expectedMessages.forEach(function(expectedMessage) {
if (test.messagesReceived === undefined \|\|		if (test.messagesReceived === undefined \|\|
test.messagesReceived.indexOf(expectedMessage) === -1)		test.messagesReceived.indexOf(expectedMessage) === -1)
- assert.fail('test ' + test.fn.name + ' should have sent message: ' +	<>	- assert(false, 'test ' + test.fn.name +
		- ' should have sent message: ' + expectedMessage +
- expectedMessage + ' but didn\'t');		- ' but didn\'t');
+ assert.fail(`test ${test.fn.name} should have sent message: ${		+ assert(false, `test ${test.fn.name} should have sent message: ${
+ expectedMessage} but didn't`);	=	+ expectedMessage} but didn't`);
});		});

if (test.messagesReceived) {		if (test.messagesReceived) {
test.messagesReceived.forEach(function(receivedMessage) {		test.messagesReceived.forEach(function(receivedMessage) {
if (test.expectedMessages.indexOf(receivedMessage) === -1) {		if (test.expectedMessages.indexOf(receivedMessage) === -1) {
- assert.fail('test ' + test.fn.name +	<>	- assert(false, 'test ' + test.fn.name +
- ' should not have sent message: ' + receivedMessage +	=	- ' should not have sent message: ' + receivedMessage +
- ' but did');		- ' but did');
+ assert.fail(`test ${test.fn.name} should not have sent message: ${	<>	+ assert(false, `test ${test.fn.name} should not have sent message: ${
+ receivedMessage} but did`);	=	+ receivedMessage} but did`);
}		}
});		});
}		}
diff --git a/test/parallel/test-domain-with-abort-on-uncaught-exception.js b/test/parallel/test-domain-with-abort-on-uncaught-exception.js		diff --git a/test/parallel/test-domain-with-abort-on-uncaught-exception.js b/test/parallel/test-domain-with-abort-on-uncaught-exception.js
index db530fbccb8..5b455f6f915 100644		index db530fbccb8..5b455f6f915 100644
--- a/test/parallel/test-domain-with-abort-on-uncaught-exception.js		--- a/test/parallel/test-domain-with-abort-on-uncaught-exception.js
+++ b/test/parallel/test-domain-with-abort-on-uncaught-exception.js		+++ b/test/parallel/test-domain-with-abort-on-uncaught-exception.js
@@ -103,14 +103,8 @@ if (process.argv[2] === 'child') {		@@ -103,14 +103,8 @@ if (process.argv[2] === 'child') {
if (options.useTryCatch)		if (options.useTryCatch)

-const expected = util.format([process.execPath, 'foo', 'bar']) + '\n';	=	-const expected = util.format([process.execPath, 'foo', 'bar']) + '\n';
+const expected = `${util.format([process.execPath, 'foo', 'bar'])}\n`;		+const expected = `${util.format([process.execPath, 'foo', 'bar'])}\n`;
exec(cmd, common.mustCall((err, stdout, stderr) => {		exec(cmd, common.mustCall((err, stdout, stderr) => {
assert.ifError(err);		assert.ifError(err);
assert.strictEqual(stderr, expected);		assert.strictEqual(stderr, expected);
diff --git a/test/parallel/test-exception-handler2.js b/test/parallel/test-exception-handler2.js		diff --git a/test/parallel/test-exception-handler2.js b/test/parallel/test-exception-handler2.js
index 0911b89dd79..ae95d452457 100644		index 1dabedf4c68..23d78d838ad 100644
--- a/test/parallel/test-exception-handler2.js		--- a/test/parallel/test-exception-handler2.js
+++ b/test/parallel/test-exception-handler2.js		+++ b/test/parallel/test-exception-handler2.js
		@@ -2,7 +2,7 @@
@@ -24,7 +24,7 @@ const common = require('../common');	<>	const common = require('../common');
const assert = require('assert');
	=
process.on('uncaughtException', function(err) {		process.on('uncaughtException', function(err) {
- console.log('Caught exception: ' + err);		- console.log('Caught exception: ' + err);
+ console.log(`Caught exception: ${err}`);		+ console.log(`Caught exception: ${err}`);
});		});

setTimeout(common.mustCall(function() {		setTimeout(common.mustCall(function() {
diff --git a/test/parallel/test-file-write-stream2.js b/test/parallel/test-file-write-stream2.js		diff --git a/test/parallel/test-file-write-stream2.js b/test/parallel/test-file-write-stream2.js
index e0e9dae3379..757d9d91b31 100644		index 504a572dde6..1d11f6de3e9 100644
--- a/test/parallel/test-file-write-stream2.js		--- a/test/parallel/test-file-write-stream2.js

- cb('' + stderr);	=	- cb('' + stderr);
+ cb(String(stderr));		+ cb(String(stderr));
}));		}));
}		}

diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js		diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js
index ee77ca08990..1c9f7a7d90e 100644		index 9efef0a2281..5edbf47ddda 100644
--- a/test/parallel/test-fs-realpath.js		--- a/test/parallel/test-fs-realpath.js
+++ b/test/parallel/test-fs-realpath.js		+++ b/test/parallel/test-fs-realpath.js
@@ -29,6 +29,7 @@ let async_completed = 0;		@@ -7,6 +7,7 @@ const exec = require('child_process').exec;
let async_expected = 0;	<>	let async_completed = 0, async_expected = 0;
const unlink = [];	=	const unlink = [];
let skipSymlinks = false;		let skipSymlinks = false;
+const tmpDir = common.tmpDir;		+const tmpDir = common.tmpDir;

common.refreshTmpDir();		common.refreshTmpDir();

@@ -62,11 +63,11 @@ if (common.isWindows) {		@@ -40,11 +41,11 @@ if (common.isWindows) {


function tmp(p) {		function tmp(p) {

}	=	}
setup();		setup();
- const linkPath = root + '/a/link/c/x.txt';		- const linkPath = root + '/a/link/c/x.txt';
- const expectPath = root + '/a/b/c/x.txt';		- const expectPath = root + '/a/b/c/x.txt';
+ const linkPath = `${root}/a/link/c/x.txt`;		+ const linkPath = `${root}/a/link/c/x.txt`;
+ const expectPath = `${root}/a/b/c/x.txt`;		+ const expectPath = `${root}/a/b/c/x.txt`;
const actual = fs.realpathSync(linkPath);		const actual = fs.realpathSync(linkPath);
// console.log({link:linkPath,expect:expectPath,actual:actual},'sync');		// console.log({link:linkPath,expect:expectPath,actual:actual},'sync');
assertEqualPath(actual, path.resolve(expectPath));		assertEqualPath(actual, path.resolve(expectPath));
@@ -506,8 +507,7 @@ function runNextTest(err) {		@@ -484,8 +485,7 @@ function runNextTest(err) {
assert.ifError(err);	<>	if (err) throw err;
const test = tests.shift();	=	const test = tests.shift();
if (!test) {		if (!test) {
- return console.log(numtests +		- return console.log(numtests +
- ' subtests completed OK for fs.realpath');		- ' subtests completed OK for fs.realpath');
+ return console.log(`${numtests} subtests completed OK for fs.realpath`);		+ return console.log(`${numtests} subtests completed OK for fs.realpath`);
}		}
testsRun++;		testsRun++;
test(runNextTest);		test(runNextTest);
diff --git a/test/parallel/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js		diff --git a/test/parallel/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js
index 0b27d90766e..3a3458a552e 100644		index dab1cb2447c..2d37e2f6ad0 100644

@@ -31,8 +31,8 @@ const linkPath = path.join(common.tmpDir, 'cycles_link');	=	@@ -10,8 +10,8 @@ const linkPath = path.join(common.tmpDir, 'cycles_link');

common.refreshTmpDir();		common.refreshTmpDir();

-console.log('linkData: ' + linkData);		-console.log('linkData: ' + linkData);
-console.log('linkPath: ' + linkPath);		-console.log('linkPath: ' + linkPath);
+console.log(`linkData: ${linkData}`);		+console.log(`linkData: ${linkData}`);
+console.log(`linkPath: ${linkPath}`);		+console.log(`linkPath: ${linkPath}`);

fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {		fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {
assert.ifError(err);	<>	if (err) throw err;
diff --git a/test/parallel/test-fs-timestamp-parsing-error.js b/test/parallel/test-fs-timestamp-parsing-error.js
index 42bbe45d511..c37cf674a4d 100644	=
--- a/test/parallel/test-fs-timestamp-parsing-error.js	+-
+++ b/test/parallel/test-fs-timestamp-parsing-error.js
@@ -5,7 +5,7 @@ const assert = require('assert');	=

[Infinity, -Infinity, NaN].forEach((input) => {	+-
assert.throws(() => fs._toUnixTimestamp(input),
- new RegExp('^Error: Cannot parse time: ' + input + '$'));
+ new RegExp(`^Error: Cannot parse time: ${input}$`));
});
	=
assert.throws(() => fs._toUnixTimestamp({}),	+-
diff --git a/test/parallel/test-fs-truncate-GH-6233.js b/test/parallel/test-fs-truncate-GH-6233.js	=	diff --git a/test/parallel/test-fs-truncate-GH-6233.js b/test/parallel/test-fs-truncate-GH-6233.js
index b2982cccb9c..07bd272024f 100644		index 95eaf12cbb7..04af7b0f3f2 100644
--- a/test/parallel/test-fs-truncate-GH-6233.js		--- a/test/parallel/test-fs-truncate-GH-6233.js
+++ b/test/parallel/test-fs-truncate-GH-6233.js		+++ b/test/parallel/test-fs-truncate-GH-6233.js
@@ -24,7 +24,7 @@ const common = require('../common');		@@ -3,7 +3,7 @@ const common = require('../common');
const assert = require('assert');		const assert = require('assert');
const fs = require('fs');		const fs = require('fs');

-const filename = common.tmpDir + '/truncate-file.txt';		-const filename = common.tmpDir + '/truncate-file.txt';
+const filename = `${common.tmpDir}/truncate-file.txt`;		+const filename = `${common.tmpDir}/truncate-file.txt`;

--- a/test/parallel/test-fs-write-string-coerce.js	=	--- a/test/parallel/test-fs-write-string-coerce.js
+++ b/test/parallel/test-fs-write-string-coerce.js		+++ b/test/parallel/test-fs-write-string-coerce.js
@@ -9,7 +9,7 @@ common.refreshTmpDir();		@@ -9,7 +9,7 @@ common.refreshTmpDir();

const fn = path.join(common.tmpDir, 'write-string-coerce.txt');		const fn = path.join(common.tmpDir, 'write-string-coerce.txt');
const data = true;		const data = true;
-const expected = data + '';		-const expected = data + '';
+const expected = String(data);		+const expected = String(data);

fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) {		fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) {
assert.ifError(err);	<>	if (err) throw err;
diff --git a/test/parallel/test-http-abort-client.js b/test/parallel/test-http-abort-client.js	=	diff --git a/test/parallel/test-http-abort-client.js b/test/parallel/test-http-abort-client.js
index 45261490cab..ada72dbcd04 100644		index 6c00a1e6c64..8d396037676 100644
--- a/test/parallel/test-http-abort-client.js		--- a/test/parallel/test-http-abort-client.js
+++ b/test/parallel/test-http-abort-client.js		+++ b/test/parallel/test-http-abort-client.js
@@ -38,11 +38,11 @@ server.listen(0, common.mustCall(function() {		@@ -17,11 +17,11 @@ server.listen(0, common.mustCall(function() {
}, common.mustCall(function(res) {		}, common.mustCall(function(res) {
server.close();		server.close();

- console.log('Got res: ' + res.statusCode);		- console.log('Got res: ' + res.statusCode);
+ console.log(`Got res: ${res.statusCode}`);		+ console.log(`Got res: ${res.statusCode}`);

- const name = 'localhost:' + server.address().port;	=	- const name = 'localhost:' + server.address().port;
+ const name = `localhost:${server.address().port}`;		+ const name = `localhost:${server.address().port}`;
assert(!http.globalAgent.sockets.hasOwnProperty(name));		assert(!http.globalAgent.sockets.hasOwnProperty(name));
assert(!http.globalAgent.requests.hasOwnProperty(name));		assert(!http.globalAgent.requests.hasOwnProperty(name));

diff --git a/test/parallel/test-http-contentLength0.js b/test/parallel/test-http-contentLength0.js		diff --git a/test/parallel/test-http-contentLength0.js b/test/parallel/test-http-contentLength0.js
index 25e098d425f..565de21c728 100644		index 537c7c0691a..0cbdb380ac0 100644
--- a/test/parallel/test-http-contentLength0.js		--- a/test/parallel/test-http-contentLength0.js
+++ b/test/parallel/test-http-contentLength0.js		+++ b/test/parallel/test-http-contentLength0.js
@@ -35,7 +35,7 @@ const s = http.createServer(function(req, res) {
s.listen(0, function() {	<>	@@ -15,7 +15,7 @@ s.listen(0, function() {
	=
	<>	const request =
const request = http.request({ port: this.address().port }, (response) => {		http.request({ port: this.address().port }, function(response) {
- console.log('STATUS: ' + response.statusCode);	=	- console.log('STATUS: ' + response.statusCode);
+ console.log(`STATUS: ${response.statusCode}`);		+ console.log(`STATUS: ${response.statusCode}`);
s.close();		s.close();
response.resume();		response.resume();
});		});
diff --git a/test/parallel/test-http-default-port.js b/test/parallel/test-http-default-port.js		diff --git a/test/parallel/test-http-default-port.js b/test/parallel/test-http-default-port.js
index c09bb184957..d53c69c1b0d 100644		index c939282a43a..981288ecf20 100644
--- a/test/parallel/test-http-default-port.js		--- a/test/parallel/test-http-default-port.js
+++ b/test/parallel/test-http-default-port.js		+++ b/test/parallel/test-http-default-port.js
@@ -35,8 +35,8 @@ const fs = require('fs');		@@ -7,8 +7,8 @@ const fs = require('fs');

	=
common.refreshTmpDir();		common.refreshTmpDir();

-const image = fs.readFileSync(common.fixturesDir + '/person.jpg');		-const image = fs.readFileSync(common.fixturesDir + '/person.jpg');
+const image = fs.readFileSync(`${common.fixturesDir}/person.jpg`);		+const image = fs.readFileSync(`${common.fixturesDir}/person.jpg`);

-console.log('image.length = ' + image.length);		-console.log('image.length = ' + image.length);
+console.log(`image.length = ${image.length}`);		+console.log(`image.length = ${image.length}`);

const total = 10;		const total = 10;
let requests = 0;	<>	let requests = 0, responses = 0;
@@ -67,12 +67,12 @@ server.listen(0, function() {	=	@@ -45,12 +45,12 @@ server.listen(0, function() {
};		};

http.get(opts, function(res) {		http.get(opts, function(res) {
- console.error('recv ' + x);		- console.error('recv ' + x);
- const s = fs.createWriteStream(common.tmpDir + '/' + x + '.jpg');		- const s = fs.createWriteStream(common.tmpDir + '/' + x + '.jpg');
+ console.error(`recv ${x}`);		+ console.error(`recv ${x}`);
+ const s = fs.createWriteStream(`${common.tmpDir}/${x}.jpg`);		+ const s = fs.createWriteStream(`${common.tmpDir}/${x}.jpg`);
res.pipe(s);		res.pipe(s);


	=
req.on('end', function() {		req.on('end', function() {
res.writeHead(200, { 'Content-Type': 'text/plain' });		res.writeHead(200, { 'Content-Type': 'text/plain' });
- res.end('You are from: ' + req.connection.remoteAddress);		- res.end('You are from: ' + req.connection.remoteAddress);
+ res.end(`You are from: ${req.connection.remoteAddress}`);		+ res.end(`You are from: ${req.connection.remoteAddress}`);
});		});
req.resume();		req.resume();
});		});
@@ -46,7 +46,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {		@@ -24,7 +24,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
}, function(res) {		}, function(res) {
assert.fail('unexpectedly got response from server');	<>	common.fail('unexpectedly got response from server');
}).on('error', common.mustCall(function(e) {	=	}).on('error', common.mustCall(function(e) {
- console.log('client got error: ' + e.message);		- console.log('client got error: ' + e.message);
+ console.log(`client got error: ${e.message}`);		+ console.log(`client got error: ${e.message}`);
server.close();		server.close();
})).end();		})).end();
}));		}));
diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js		diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js
index 9053c5e089b..35f2c15f8d9 100644		index d48a4ec8f5b..a815e6a3ac9 100644
--- a/test/parallel/test-http-localaddress.js		--- a/test/parallel/test-http-localaddress.js
+++ b/test/parallel/test-http-localaddress.js		+++ b/test/parallel/test-http-localaddress.js

@@ -71,14 +71,13 @@ const multipleForbidden = [	=	@@ -50,12 +50,12 @@ const multipleForbidden = [

const srv = http.createServer(function(req, res) {		const srv = http.createServer(function(req, res) {
multipleForbidden.forEach(function(header) {		multipleForbidden.forEach(function(header) {
- assert.strictEqual(req.headers[header.toLowerCase()],		- assert.strictEqual(req.headers[header.toLowerCase()],
- 'foo', 'header parsed incorrectly: ' + header);		- 'foo', 'header parsed incorrectly: ' + header);
+ assert.strictEqual(req.headers[header.toLowerCase()], 'foo',		+ assert.strictEqual(req.headers[header.toLowerCase()], 'foo',
+ `header parsed incorrectly: ${header}`);		+ `header parsed incorrectly: ${header}`);
});		});
multipleAllowed.forEach(function(header) {		multipleAllowed.forEach(function(header) {
const sep = (header.toLowerCase() === 'cookie' ? '; ' : ', ');	<>
- assert.strictEqual(req.headers[header.toLowerCase()],		assert.strictEqual(req.headers[header.toLowerCase()],
- 'foo' + sep + 'bar',
- 'header parsed incorrectly: ' + header);		- 'foo, bar', 'header parsed incorrectly: ' + header);
+ assert.strictEqual(req.headers[header.toLowerCase()], `foo${sep}bar`,
+ `header parsed incorrectly: ${header}`);		+ 'foo, bar', `header parsed incorrectly: ${header}`);
});	=	});

res.writeHead(200, {'Content-Type': 'text/plain'});		res.writeHead(200, {'Content-Type': 'text/plain'});
diff --git a/test/parallel/test-http-should-keep-alive.js b/test/parallel/test-http-should-keep-alive.js		diff --git a/test/parallel/test-http-should-keep-alive.js b/test/parallel/test-http-should-keep-alive.js
index 742c1f03bde..9e3f96fd534 100644		index 190c8c8d884..5dfcbdd4707 100644
--- a/test/parallel/test-http-should-keep-alive.js		--- a/test/parallel/test-http-should-keep-alive.js
+++ b/test/parallel/test-http-should-keep-alive.js		+++ b/test/parallel/test-http-should-keep-alive.js
@@ -51,10 +51,10 @@ const server = net.createServer(function(socket) {		@@ -30,10 +30,10 @@ const server = net.createServer(function(socket) {
}).listen(0, function() {		}).listen(0, function() {
function makeRequest() {		function makeRequest() {

index d7a3c1cf47d..e9d4950a465 100644	=	index 1178c745e1e..37810f0179f 100644
--- a/test/parallel/test-http.js		--- a/test/parallel/test-http.js
+++ b/test/parallel/test-http.js		+++ b/test/parallel/test-http.js
@@ -54,7 +54,7 @@ const server = http.Server(common.mustCall(function(req, res) {		@@ -30,7 +30,7 @@ const server = http.Server(function(req, res) {

req.on('end', function() {		req.on('end', function() {
res.writeHead(200, {'Content-Type': 'text/plain'});		res.writeHead(200, {'Content-Type': 'text/plain'});
- res.write('The path was ' + url.parse(req.url).pathname);		- res.write('The path was ' + url.parse(req.url).pathname);
+ res.write(`The path was ${url.parse(req.url).pathname}`);		+ res.write(`The path was ${url.parse(req.url).pathname}`);
res.end();		res.end();
	-+	responses_sent += 1;
});	=	});
req.resume();	+-
diff --git a/test/parallel/test-https-agent-create-connection.js b/test/parallel/test-https-agent-create-connection.js	=	diff --git a/test/parallel/test-https-agent-create-connection.js b/test/parallel/test-https-agent-create-connection.js
index 7bb79567cb1..a1f0c4ace4c 100644		index 6bd86fe166d..faaa8ef78f5 100644
--- a/test/parallel/test-https-agent-create-connection.js		--- a/test/parallel/test-https-agent-create-connection.js
+++ b/test/parallel/test-https-agent-create-connection.js		+++ b/test/parallel/test-https-agent-create-connection.js
@@ -14,8 +14,8 @@ const agent = new https.Agent();		@@ -14,8 +14,8 @@ const agent = new https.Agent();
const fs = require('fs');		const fs = require('fs');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`),		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`),
};		};

const expectedHeader = /^HTTP\/1\.1 200 OK/;	<>	const expectedHeader = /^HTTP\/1.1 200 OK/;
diff --git a/test/parallel/test-https-agent-disable-session-reuse.js b/test/parallel/test-https-agent-disable-session-reuse.js	=	diff --git a/test/parallel/test-https-agent-disable-session-reuse.js b/test/parallel/test-https-agent-disable-session-reuse.js
index 7cca9c713ae..0331cd4e283 100644		index 7cca9c713ae..0331cd4e283 100644
--- a/test/parallel/test-https-agent-disable-session-reuse.js		--- a/test/parallel/test-https-agent-disable-session-reuse.js
+++ b/test/parallel/test-https-agent-disable-session-reuse.js		+++ b/test/parallel/test-https-agent-disable-session-reuse.js
@@ -14,8 +14,8 @@ const https = require('https');		@@ -14,8 +14,8 @@ const https = require('https');
const fs = require('fs');		const fs = require('fs');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

const clientSessions = [];		const clientSessions = [];
diff --git a/test/parallel/test-https-agent-secure-protocol.js b/test/parallel/test-https-agent-secure-protocol.js	+-
index 7cca682101f..c11d9f8ca87 100644	=
--- a/test/parallel/test-https-agent-secure-protocol.js	+-
+++ b/test/parallel/test-https-agent-secure-protocol.js
@@ -11,9 +11,9 @@ const https = require('https');	=
const fs = require('fs');	+-
	=
const options = {	+-
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),
- ca: fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`),
+ ca: fs.readFileSync(`${common.fixturesDir}/keys/ca1-cert.pem`)
};
	=
const server = https.Server(options, function(req, res) {	+-
diff --git a/test/parallel/test-https-agent-servername.js b/test/parallel/test-https-agent-servername.js	=	diff --git a/test/parallel/test-https-agent-servername.js b/test/parallel/test-https-agent-servername.js
index a321f714039..8562d021c99 100644		index a321f714039..8562d021c99 100644
--- a/test/parallel/test-https-agent-servername.js		--- a/test/parallel/test-https-agent-servername.js
+++ b/test/parallel/test-https-agent-servername.js		+++ b/test/parallel/test-https-agent-servername.js
@@ -10,9 +10,9 @@ const https = require('https');		@@ -10,9 +10,9 @@ const https = require('https');
const fs = require('fs');		const fs = require('fs');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),

+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),	=	+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

const body = 'hello world\n';		const body = 'hello world\n';
diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js		diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js
index cd22adf6a83..482eedec291 100644		index 043e21bf7e3..fe7723ac229 100644
--- a/test/parallel/test-https-client-get-url.js		--- a/test/parallel/test-https-client-get-url.js
+++ b/test/parallel/test-https-client-get-url.js		+++ b/test/parallel/test-https-client-get-url.js
@@ -37,8 +37,8 @@ const url = require('url');		@@ -14,8 +14,8 @@ const https = require('https');
const URL = url.URL;	<>	const fs = require('fs');
	=
const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

const server = https.createServer(options, common.mustCall(function(req, res) {		const server = https.createServer(options, common.mustCall(function(req, res) {
diff --git a/test/parallel/test-https-client-resume.js b/test/parallel/test-https-client-resume.js		diff --git a/test/parallel/test-https-client-resume.js b/test/parallel/test-https-client-resume.js

--- a/test/parallel/test-https-foafssl.js	=	--- a/test/parallel/test-https-foafssl.js
+++ b/test/parallel/test-https-foafssl.js		+++ b/test/parallel/test-https-foafssl.js
@@ -40,8 +40,8 @@ if (!common.hasCrypto) {		@@ -19,8 +19,8 @@ if (!common.hasCrypto) {
const https = require('https');		const https = require('https');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/agent.key'),		- key: fs.readFileSync(common.fixturesDir + '/agent.key'),
- cert: fs.readFileSync(common.fixturesDir + '/agent.crt'),		- cert: fs.readFileSync(common.fixturesDir + '/agent.crt'),
+ key: fs.readFileSync(`${common.fixturesDir}/agent.key`),		+ key: fs.readFileSync(`${common.fixturesDir}/agent.key`),
+ cert: fs.readFileSync(`${common.fixturesDir}/agent.crt`),		+ cert: fs.readFileSync(`${common.fixturesDir}/agent.crt`),
requestCert: true,	<>	requestCert: true
rejectUnauthorized: false
};	=	};

diff --git a/test/parallel/test-https-host-headers.js b/test/parallel/test-https-host-headers.js		diff --git a/test/parallel/test-https-host-headers.js b/test/parallel/test-https-host-headers.js
index ce18522fc5b..adb8952871c 100644		index cc5047bea7f..6ea1c642420 100644
--- a/test/parallel/test-https-host-headers.js		--- a/test/parallel/test-https-host-headers.js
+++ b/test/parallel/test-https-host-headers.js		+++ b/test/parallel/test-https-host-headers.js
@@ -10,19 +10,19 @@ const https = require('https');		@@ -10,19 +10,19 @@ const https = require('https');

const fs = require('fs');		const fs = require('fs');
const options = {		const options = {

@@ -41,7 +41,7 @@ function testHttps() {	=	@@ -41,7 +41,7 @@ function testHttps() {

function cb(res) {		function cb(res) {
counter--;		counter--;
- console.log('back from https request. counter = ' + counter);		- console.log('back from https request. counter = ' + counter);
+ console.log(`back from https request. counter = ${counter}`);		+ console.log(`back from https request. counter = ${counter}`);
if (counter === 0) {		if (counter === 0) {
httpsServer.close();		httpsServer.close();
console.log('ok');		console.log('ok');
@@ -54,7 +54,7 @@ function testHttps() {		@@ -56,7 +56,7 @@ function testHttps() {
assert.ifError(er);	<>
https.get({	=	https.get({
method: 'GET',		method: 'GET',
- path: '/' + (counter++),		- path: '/' + (counter++),
+ path: `/${counter++}`,		+ path: `/${counter++}`,
host: 'localhost',		host: 'localhost',
//agent: false,		//agent: false,
port: this.address().port,		port: this.address().port,
@@ -63,7 +63,7 @@ function testHttps() {		@@ -65,7 +65,7 @@ function testHttps() {

https.request({		https.request({

	=
req.on('end', function() {		req.on('end', function() {
res.writeHead(200, { 'Content-Type': 'text/plain' });		res.writeHead(200, { 'Content-Type': 'text/plain' });
- res.end('You are from: ' + req.connection.remoteAddress);		- res.end('You are from: ' + req.connection.remoteAddress);
+ res.end(`You are from: ${req.connection.remoteAddress}`);		+ res.end(`You are from: ${req.connection.remoteAddress}`);
});		});
req.resume();		req.resume();
});		});
@@ -57,7 +57,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {		@@ -35,7 +35,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
}, function(res) {		}, function(res) {
assert.fail('unexpectedly got response from server');	<>	common.fail('unexpectedly got response from server');
}).on('error', common.mustCall(function(e) {	=	}).on('error', common.mustCall(function(e) {
- console.log('client got error: ' + e.message);		- console.log('client got error: ' + e.message);
+ console.log(`client got error: ${e.message}`);		+ console.log(`client got error: ${e.message}`);
server.close();		server.close();
})).end();		})).end();
}));		}));
diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js		diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js
index f6f0f5d5007..bcd1d6fdbd7 100644		index 1c796f5843c..d6600199511 100644
--- a/test/parallel/test-https-localaddress.js		--- a/test/parallel/test-https-localaddress.js
+++ b/test/parallel/test-https-localaddress.js		+++ b/test/parallel/test-https-localaddress.js

+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),	=	+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

const body = 'hello world\n';		const body = 'hello world\n';
diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js		diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js
index 01fad2f5948..f28164a322a 100644		index 9f417ce4914..765887f2af0 100644
--- a/test/parallel/test-https-strict.js		--- a/test/parallel/test-https-strict.js
+++ b/test/parallel/test-https-strict.js		+++ b/test/parallel/test-https-strict.js
@@ -149,7 +149,7 @@ function makeReq(path, port, error, host, ca) {		@@ -132,7 +132,7 @@ function makeReq(path, port, error, host, ca) {
port === server2.address().port ? server2 :	<>
port === server3.address().port ? server3 :		: port === server3.address().port ? server3
null;		: null;
	=
- if (!server) throw new Error('invalid port: ' + port);		- if (!server) throw new Error('invalid port: ' + port);
+ if (!server) throw new Error(`invalid port: ${port}`);		+ if (!server) throw new Error(`invalid port: ${port}`);
server.expectCount++;		server.expectCount++;

req.on('response', common.mustCall((res) => {	<>	req.on('response', function(res) {
diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js	=	diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
index d31f6ba4c17..08144f108b2 100644		index ec629f39314..20156207404 100644
--- a/test/parallel/test-https-timeout-server-2.js		--- a/test/parallel/test-https-timeout-server-2.js
+++ b/test/parallel/test-https-timeout-server-2.js		+++ b/test/parallel/test-https-timeout-server-2.js
@@ -34,8 +34,8 @@ const tls = require('tls');		@@ -13,8 +13,8 @@ const tls = require('tls');
const fs = require('fs');		const fs = require('fs');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')

+const cert = fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`);	=	+const cert = fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`);

// number of bytes discovered empirically to trigger the bug		// number of bytes discovered empirically to trigger the bug
const data = Buffer.alloc(1024 * 32 + 1);		const data = Buffer.alloc(1024 * 32 + 1);
diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js		diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js
index d10c76283c2..1eb0521fb0f 100644		index 6bbe71ec147..5f4c0f90120 100644
--- a/test/parallel/test-intl.js		--- a/test/parallel/test-intl.js
+++ b/test/parallel/test-intl.js		+++ b/test/parallel/test-intl.js
@@ -49,16 +49,14 @@ assert.strictEqual('ç'.toUpperCase(), 'Ç');		@@ -21,16 +21,14 @@ function haveLocale(loc) {

if (!common.hasIntl) {	<>	if (!haveIntl) {
const erMsg =	=	const erMsg =
- '"Intl" object is NOT present but v8_enable_i18n_support is ' +		- '"Intl" object is NOT present but v8_enable_i18n_support is ' +
- enablei18n;		- enablei18n;
+ `"Intl" object is NOT present but v8_enable_i18n_support is ${enablei18n}`;		+ `"Intl" object is NOT present but v8_enable_i18n_support is ${enablei18n}`;
assert.strictEqual(enablei18n, 0, erMsg);		assert.strictEqual(enablei18n, 0, erMsg);
common.skip('Intl tests because Intl object not present.');		common.skip('Intl tests because Intl object not present.');

} else {		} else {
const erMsg =		const erMsg =
- '"Intl" object is present but v8_enable_i18n_support is ' +		- '"Intl" object is present but v8_enable_i18n_support is ' +

});	=	});
@@ -60,7 +60,7 @@ tcp.listen(0, function() {		@@ -39,7 +39,7 @@ tcp.listen(0, function() {
connectHappened = true;		connectHappened = true;
});		});

- console.log('connecting = ' + socket.connecting);		- console.log('connecting = ' + socket.connecting);
+ console.log(`connecting = ${socket.connecting}`);		+ console.log(`connecting = ${socket.connecting}`);

assert.strictEqual('opening', socket.readyState);		assert.strictEqual('opening', socket.readyState);

diff --git a/test/parallel/test-net-connect-options-allowhalfopen.js b/test/parallel/test-net-connect-options-allowhalfopen.js	+-
index 4bf6b9094bd..4a0cc18772a 100644	=
--- a/test/parallel/test-net-connect-options-allowhalfopen.js	+-
+++ b/test/parallel/test-net-connect-options-allowhalfopen.js
@@ -105,7 +105,7 @@ const forAllClients = (cb) => common.mustCall(cb, CLIENT_VARIANTS);	=
console.error(`No. ${index} client received FIN`);	+-
assert(!client.readable);
assert(client.writable);
- assert(client.write(index + ''));
+ assert(client.write(String(index)));
client.end();
clientSentFIN++;
console.error(`No. ${index} client sent FIN, ` +
diff --git a/test/parallel/test-net-connect-options-fd.js b/test/parallel/test-net-connect-options-fd.js
index 9cc581243f9..9e3859f8431 100644	=
--- a/test/parallel/test-net-connect-options-fd.js	+-
+++ b/test/parallel/test-net-connect-options-fd.js
@@ -69,13 +69,13 @@ const forAllClients = (cb) => common.mustCall(cb, CLIENT_VARIANTS);	=
})	+-
.on('error', function(err) {
console.error(err);
- assert.fail(null, null, '[Pipe server]' + err);
+ assert.fail(null, null, `[Pipe server]${err}`);
})
.listen({path: serverPath}, common.mustCall(function serverOnListen() {
const getSocketOpt = (index) => {
const handle = new Pipe();
const err = handle.bind(`${prefix}-client-${socketCounter++}`);
- assert(err >= 0, '' + err);
+ assert(err >= 0, String(err));
assert.notStrictEqual(handle.fd, -1);
handleMap.set(index, handle);
console.error(`[Pipe]Bound handle with Pipe ${handle.fd}`);
@@ -90,11 +90,11 @@ const forAllClients = (cb) => common.mustCall(cb, CLIENT_VARIANTS);	=
assert(handleMap.has(index));	+-
const oldHandle = handleMap.get(index);
assert.strictEqual(oldHandle.fd, this._handle.fd);
- client.write(oldHandle.fd + '');
+ client.write(String(oldHandle.fd));
console.error(`[Pipe]Sending data through fd ${oldHandle.fd}`);
client.on('error', function(err) {
console.error(err);
- assert.fail(null, null, '[Pipe Client]' + err);
+ assert.fail(null, null, `[Pipe Client]${err}`);
});
});
	=
diff --git a/test/parallel/test-net-connect-options-port.js b/test/parallel/test-net-connect-options-port.js	+-
index 73a719c7bdd..b3c370c8d90 100644	=
--- a/test/parallel/test-net-connect-options-port.js	+-
+++ b/test/parallel/test-net-connect-options-port.js
@@ -88,8 +88,8 @@ const net = require('net');	=

// Total connections = 3 * 4(canConnect) * 6(doConnect) = 72	+-
canConnect(port);
- canConnect(port + '');
- canConnect('0x' + port.toString(16));
+ canConnect(String(port));
+ canConnect(`0x${port.toString(16)}`);
}));
	=
// Try connecting to random ports, but do so once the server is closed	+-
@@ -191,7 +191,7 @@ function canConnect(port) {	=
function asyncFailToConnect(port) {	+-
const onError = () => common.mustCall(function(err) {
const regexp = /^Error: connect (E\w+)(.+)$/;
- assert(regexp.test(err + ''), err + '');
+ assert(regexp.test(String(err)), String(err));
});
	=
const dont = () => common.mustNotCall();	+-
diff --git a/test/parallel/test-net-internal.js b/test/parallel/test-net-internal.js	=	diff --git a/test/parallel/test-net-internal.js b/test/parallel/test-net-internal.js
index a79d022a5d7..309b56d4d9a 100644		index a79d022a5d7..309b56d4d9a 100644
--- a/test/parallel/test-net-internal.js		--- a/test/parallel/test-net-internal.js
+++ b/test/parallel/test-net-internal.js		+++ b/test/parallel/test-net-internal.js
@@ -8,7 +8,7 @@ const isLegalPort = require('internal/net').isLegalPort;		@@ -8,7 +8,7 @@ const isLegalPort = require('internal/net').isLegalPort;

for (let n = 0; n <= 0xFFFF; n++) {		for (let n = 0; n <= 0xFFFF; n++) {
assert(isLegalPort(n));		assert(isLegalPort(n));
- assert(isLegalPort('' + n));		- assert(isLegalPort('' + n));
+ assert(isLegalPort(String(n)));		+ assert(isLegalPort(String(n)));
assert(`0x${n.toString(16)}`);		assert(`0x${n.toString(16)}`);
assert(`0o${n.toString(8)}`);		assert(`0o${n.toString(8)}`);
assert(`0b${n.toString(2)}`);		assert(`0b${n.toString(2)}`);
diff --git a/test/parallel/test-net-listen-shared-ports.js b/test/parallel/test-net-listen-shared-ports.js	+-
index 7b075511a49..c16285278af 100644	=
--- a/test/parallel/test-net-listen-shared-ports.js	+-
+++ b/test/parallel/test-net-listen-shared-ports.js
@@ -44,12 +44,12 @@ if (cluster.isMaster) {	=

server1.on('error', function(err) {	+-
// no errors expected
- process.send('server1:' + err.code);
+ process.send(`server1:${err.code}`);
});
	=
server2.on('error', function(err) {	+-
// an error is expected on the second worker
- process.send('server2:' + err.code);
+ process.send(`server2:${err.code}`);
});
	=
server1.listen({	+-
diff --git a/test/parallel/test-net-pipe-connect-errors.js b/test/parallel/test-net-pipe-connect-errors.js	=	diff --git a/test/parallel/test-net-pipe-connect-errors.js b/test/parallel/test-net-pipe-connect-errors.js
index be0827e3f83..5ad77b7209f 100644		index 6dc2a340651..16e60a2525b 100644
--- a/test/parallel/test-net-pipe-connect-errors.js		--- a/test/parallel/test-net-pipe-connect-errors.js
+++ b/test/parallel/test-net-pipe-connect-errors.js		+++ b/test/parallel/test-net-pipe-connect-errors.js
@@ -41,7 +41,7 @@ if (common.isWindows) {		@@ -20,7 +20,7 @@ if (common.isWindows) {
// on CI for a POSIX socket. Even though this isn't actually a socket file,		// on CI for a POSIX socket. Even though this isn't actually a socket file,
// the error will be different from the one we are expecting if we exceed the		// the error will be different from the one we are expecting if we exceed the
// limit.		// limit.
- emptyTxt = common.tmpDir + '0.txt';		- emptyTxt = common.tmpDir + '0.txt';
+ emptyTxt = `${common.tmpDir}0.txt`;		+ emptyTxt = `${common.tmpDir}0.txt`;

function cleanup() {		function cleanup() {
try {		try {
diff --git a/test/parallel/test-net-reconnect-error.js b/test/parallel/test-net-reconnect-error.js		diff --git a/test/parallel/test-net-reconnect-error.js b/test/parallel/test-net-reconnect-error.js
index 166d177365b..d9a68e01d07 100644		index 4e1e3d14984..a36e3c73a94 100644
--- a/test/parallel/test-net-reconnect-error.js		--- a/test/parallel/test-net-reconnect-error.js
+++ b/test/parallel/test-net-reconnect-error.js		+++ b/test/parallel/test-net-reconnect-error.js
@@ -33,7 +33,7 @@ const c = net.createConnection(common.PORT);		@@ -15,7 +15,7 @@ c.on('connect', function() {
c.on('connect', common.mustNotCall('client should not have connected'));	<>	});
	=
c.on('error', function(e) {		c.on('error', function(e) {
- console.error('CLIENT error: ' + e.code);		- console.error('CLIENT error: ' + e.code);
+ console.error(`CLIENT error: ${e.code}`);		+ console.error(`CLIENT error: ${e.code}`);
client_error_count++;		client_error_count++;
assert.strictEqual('ECONNREFUSED', e.code);		assert.strictEqual('ECONNREFUSED', e.code);
});		});
diff --git a/test/parallel/test-net-reconnect.js b/test/parallel/test-net-reconnect.js		diff --git a/test/parallel/test-net-reconnect.js b/test/parallel/test-net-reconnect.js
index 5b66c45e20b..c8b1503cea3 100644		index c970ad7fc5c..74d8b6692e9 100644
--- a/test/parallel/test-net-reconnect.js		--- a/test/parallel/test-net-reconnect.js

	=
if (address1.family === 'IPv6')		if (address1.family === 'IPv6')
- expectedConnectionKey1 = '6::::' + address1.port;		- expectedConnectionKey1 = '6::::' + address1.port;
+ expectedConnectionKey1 = `6::::${address1.port}`;		+ expectedConnectionKey1 = `6::::${address1.port}`;
else		else
- expectedConnectionKey1 = '4:0.0.0.0:' + address1.port;		- expectedConnectionKey1 = '4:0.0.0.0:' + address1.port;
+ expectedConnectionKey1 = `4:0.0.0.0:${address1.port}`;		+ expectedConnectionKey1 = `4:0.0.0.0:${address1.port}`;

assert.strictEqual(connectionKey1, expectedConnectionKey1);		assert.strictEqual(connectionKey1, expectedConnectionKey1);
assert.strictEqual(common.PORT + 1, address2.port);		assert.strictEqual(common.PORT + 1, address2.port);
diff --git a/test/parallel/test-net-server-listen-handle.js b/test/parallel/test-net-server-listen-handle.js	+-
index 8d25d885770..09398bd0e36 100644	=
--- a/test/parallel/test-net-server-listen-handle.js	+-
+++ b/test/parallel/test-net-server-listen-handle.js
@@ -30,7 +30,7 @@ let counter = 0;	=

// Avoid conflict with listen-path	+-
function randomPipePath() {
- return common.PIPE + '-listen-handle-' + (counter++);
+ return `${common.PIPE}-listen-handle-${counter++}`;
}
	=
function randomHandle(type) {	+-
@@ -146,7 +146,7 @@ if (!common.isWindows) { // Windows doesn't support {fd: <n>}	=
net.createServer()	+-
.listen({fd: fd}, common.mustNotCall())
.on('error', common.mustCall(function(err) {
- assert.strictEqual(err + '', 'Error: listen EINVAL');
+ assert.strictEqual(String(err), 'Error: listen EINVAL');
this.close();
}));
}
diff --git a/test/parallel/test-net-server-listen-path.js b/test/parallel/test-net-server-listen-path.js
index f9cc982a428..2dbd588bafa 100644	=
--- a/test/parallel/test-net-server-listen-path.js	+-
+++ b/test/parallel/test-net-server-listen-path.js
@@ -15,7 +15,7 @@ let counter = 0;	=

// Avoid conflict with listen-handle	+-
function randomPipePath() {
- return common.PIPE + '-listen-path-' + (counter++);
+ return `${common.PIPE}-listen-path-${counter++}`;
}
	=
// Test listen(path)	+-
diff --git a/test/parallel/test-net-server-max-connections-close-makes-more-available.js b/test/parallel/test-net-server-max-connections-close-makes-more-available.js	=	diff --git a/test/parallel/test-net-server-max-connections-close-makes-more-available.js b/test/parallel/test-net-server-max-connections-close-makes-more-available.js
index 9fd34a6f45f..12f1f81ffd0 100644		index 11ec136eb3d..f7ab54b7b83 100644
--- a/test/parallel/test-net-server-max-connections-close-makes-more-available.js		--- a/test/parallel/test-net-server-max-connections-close-makes-more-available.js
+++ b/test/parallel/test-net-server-max-connections-close-makes-more-available.js		+++ b/test/parallel/test-net-server-max-connections-close-makes-more-available.js
@@ -18,12 +18,12 @@ const received = [];		@@ -18,12 +18,12 @@ const received = [];
const sent = [];		const sent = [];

function createConnection(index) {		function createConnection(index) {
- console.error('creating connection ' + index);		- console.error('creating connection ' + index);
+ console.error(`creating connection ${index}`);		+ console.error(`creating connection ${index}`);

}	=	}

function closeConnection(index) {		function closeConnection(index) {
- console.error('closing connection ' + index);		- console.error('closing connection ' + index);
+ console.error(`closing connection ${index}`);		+ console.error(`closing connection ${index}`);
return new Promise(function(resolve, reject) {		return new Promise(function(resolve, reject) {
connections[index].on('end', function() {		connections[index].on('end', function() {
resolve();		resolve();
@@ -59,8 +59,8 @@ function closeConnection(index) {		@@ -59,8 +59,8 @@ function closeConnection(index) {

const server = net.createServer(function(socket) {	<>	let server = net.createServer(function(socket) {
socket.on('data', function(data) {	=	socket.on('data', function(data) {
- console.error('received message: ' + data);		- console.error('received message: ' + data);
- received.push('' + data);		- received.push('' + data);
+ console.error(`received message: ${data}`);		+ console.error(`received message: ${data}`);
+ received.push(String(data));		+ received.push(String(data));
socket.write('acknowledged');		socket.write('acknowledged');
});		});
});		});
diff --git a/test/parallel/test-next-tick-ordering.js b/test/parallel/test-next-tick-ordering.js		diff --git a/test/parallel/test-next-tick-ordering.js b/test/parallel/test-next-tick-ordering.js
index cd784cf8c06..76f43efa932 100644		index ea019facdd8..4e19f3a5fdf 100644

	=
@@ -56,7 +56,7 @@ function handleExit(code, signalCode) {		@@ -52,7 +52,7 @@ function handleExit(code, signalCode) {
assert.strictEqual(code, 0, `npm install got error code ${code}`);		assert.strictEqual(code, 0, `npm install got error code ${code}`);
assert.strictEqual(signalCode, null, `unexpected signal: ${signalCode}`);		assert.strictEqual(signalCode, null, `unexpected signal: ${signalCode}`);
assert.doesNotThrow(function() {		assert.doesNotThrow(function() {
- fs.accessSync(installDir + '/node_modules/package-name');		- fs.accessSync(installDir + '/node_modules/package-name');
+ fs.accessSync(`${installDir}/node_modules/package-name`);		+ fs.accessSync(`${installDir}/node_modules/package-name`);
});		});
}		}

diff --git a/test/parallel/test-openssl-ca-options.js b/test/parallel/test-openssl-ca-options.js	+-
index f27976fab7c..144a7dfe3d0 100644	=
--- a/test/parallel/test-openssl-ca-options.js	+-
+++ b/test/parallel/test-openssl-ca-options.js
@@ -15,9 +15,9 @@ const result = childProcess.spawnSync(process.execPath, [	=
'-p', 'process.version'],	+-
{encoding: 'utf8'});
	=
-assert.strictEqual(result.stderr,	+-
- process.execPath + ': either --use-openssl-ca or ' +
- '--use-bundled-ca can be used, not both' + os.EOL);
+assert.strictEqual(result.stderr, `${process.execPath
+ }: either --use-openssl-ca or --use-bundled-ca can be used, not both${os.EOL}`
+);
assert.strictEqual(result.status, 9);
	=
const useBundledCA = childProcess.spawnSync(process.execPath, [	+-
diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js	=	diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js
index 6092c411a83..a62c8b8512d 100644		index 82f5b1a5d7c..447d88c1644 100644
--- a/test/parallel/test-os.js		--- a/test/parallel/test-os.js
+++ b/test/parallel/test-os.js		+++ b/test/parallel/test-os.js
@@ -43,7 +43,7 @@ if (common.isWindows) {		@@ -22,7 +22,7 @@ if (common.isWindows) {
process.env.TEMP = '';		process.env.TEMP = '';
assert.strictEqual(os.tmpdir(), '/tmp');		assert.strictEqual(os.tmpdir(), '/tmp');
process.env.TMP = '';		process.env.TMP = '';
- const expected = (process.env.SystemRoot \|\| process.env.windir) + '\\temp';		- const expected = (process.env.SystemRoot \|\| process.env.windir) + '\\temp';
+ const expected = `${process.env.SystemRoot \|\| process.env.windir}\\temp`;		+ const expected = `${process.env.SystemRoot \|\| process.env.windir}\\temp`;

});	=	});
return option;		return option;
};		};
@@ -30,7 +30,7 @@ const fixtureD = fixture('define-global.js');		@@ -30,7 +30,7 @@ const fixtureD = fixture('define-global.js');
const fixtureThrows = fixture('throws_error4.js');		const fixtureThrows = fixture('throws_error4.js');

// test preloading a single module works		// test preloading a single module works
-childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + ' ' + fixtureB,		-childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + ' ' + fixtureB,
+childProcess.exec(`${nodeBinary} ${preloadOption([fixtureA])} ${fixtureB}`,		+childProcess.exec(`${nodeBinary} ${preloadOption([fixtureA])} ${fixtureB}`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
assert.ifError(err);	<>	if (err) throw err;
assert.strictEqual(stdout, 'A\nB\n');	=	assert.strictEqual(stdout, 'A\nB\n');
@@ -38,7 +38,7 @@ childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + ' ' + fixtureB,		@@ -38,7 +38,7 @@ childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + ' ' + fixtureB,

// test preloading multiple modules works		// test preloading multiple modules works
childProcess.exec(		childProcess.exec(
- nodeBinary + ' ' + preloadOption([fixtureA, fixtureB]) + ' ' + fixtureC,		- nodeBinary + ' ' + preloadOption([fixtureA, fixtureB]) + ' ' + fixtureC,
+ `${nodeBinary} ${preloadOption([fixtureA, fixtureB])} ${fixtureC}`,		+ `${nodeBinary} ${preloadOption([fixtureA, fixtureB])} ${fixtureC}`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
assert.ifError(err);	<>	if (err) throw err;
assert.strictEqual(stdout, 'A\nB\nC\n');	=	assert.strictEqual(stdout, 'A\nB\nC\n');
@@ -47,7 +47,7 @@ childProcess.exec(		@@ -47,7 +47,7 @@ childProcess.exec(

// test that preloading a throwing module aborts		// test that preloading a throwing module aborts
childProcess.exec(		childProcess.exec(
- nodeBinary + ' ' + preloadOption([fixtureA, fixtureThrows]) + ' ' + fixtureB,		- nodeBinary + ' ' + preloadOption([fixtureA, fixtureThrows]) + ' ' + fixtureB,
+ `${nodeBinary} ${preloadOption([fixtureA, fixtureThrows])} ${fixtureB}`,		+ `${nodeBinary} ${preloadOption([fixtureA, fixtureThrows])} ${fixtureB}`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
if (err) {		if (err) {
assert.strictEqual(stdout, 'A\n');		assert.strictEqual(stdout, 'A\n');
@@ -59,7 +59,7 @@ childProcess.exec(		@@ -59,7 +59,7 @@ childProcess.exec(

// test that preload can be used with --eval		// test that preload can be used with --eval
childProcess.exec(		childProcess.exec(
- nodeBinary + ' ' + preloadOption([fixtureA]) + '-e "console.log(\'hello\');"',		- nodeBinary + ' ' + preloadOption([fixtureA]) + '-e "console.log(\'hello\');"',
+ `${nodeBinary} ${preloadOption([fixtureA])}-e "console.log('hello');"`,		+ `${nodeBinary} ${preloadOption([fixtureA])}-e "console.log('hello');"`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
assert.ifError(err);	<>	if (err) throw err;
assert.strictEqual(stdout, 'A\nhello\n');	=	assert.strictEqual(stdout, 'A\nhello\n');
@@ -105,8 +105,8 @@ replProc.on('close', function(code) {		@@ -105,8 +105,8 @@ replProc.on('close', function(code) {
// test that preload placement at other points in the cmdline		// test that preload placement at other points in the cmdline
// also test that duplicated preload only gets loaded once		// also test that duplicated preload only gets loaded once
childProcess.exec(		childProcess.exec(
- nodeBinary + ' ' + preloadOption([fixtureA]) +		- nodeBinary + ' ' + preloadOption([fixtureA]) +
- '-e "console.log(\'hello\');" ' + preloadOption([fixtureA, fixtureB]),		- '-e "console.log(\'hello\');" ' + preloadOption([fixtureA, fixtureB]),
+ `${nodeBinary} ${preloadOption([fixtureA])}-e "console.log('hello');" ${		+ `${nodeBinary} ${preloadOption([fixtureA])}-e "console.log('hello');" ${
+ preloadOption([fixtureA, fixtureB])}`,		+ preloadOption([fixtureA, fixtureB])}`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
assert.ifError(err);	<>	if (err) throw err;
assert.strictEqual(stdout, 'A\nB\nhello\n');	=	assert.strictEqual(stdout, 'A\nB\nhello\n');
@@ -115,7 +115,7 @@ childProcess.exec(		@@ -115,7 +115,7 @@ childProcess.exec(

// test that preload works with -i		// test that preload works with -i
const interactive = childProcess.exec(		const interactive = childProcess.exec(
- nodeBinary + ' ' + preloadOption([fixtureD]) + '-i',		- nodeBinary + ' ' + preloadOption([fixtureD]) + '-i',
+ `${nodeBinary} ${preloadOption([fixtureD])}-i`,		+ `${nodeBinary} ${preloadOption([fixtureD])}-i`,
common.mustCall(function(err, stdout, stderr) {		common.mustCall(function(err, stdout, stderr) {
assert.ifError(err);		assert.ifError(err);
assert.strictEqual(stdout, "> 'test'\n> ");		assert.strictEqual(stdout, "> 'test'\n> ");
@@ -126,8 +126,8 @@ interactive.stdin.write('a\n');		@@ -126,8 +126,8 @@ interactive.stdin.write('a\n');
interactive.stdin.write('process.exit()\n');		interactive.stdin.write('process.exit()\n');

childProcess.exec(		childProcess.exec(
- `${nodeBinary} --require ${fixture('cluster-preload.js')} ` +		- `${nodeBinary} --require ${fixture('cluster-preload.js')} ` +
- fixture('cluster-preload-test.js'),		- fixture('cluster-preload-test.js'),
+ `${nodeBinary} --require ${fixture('cluster-preload.js')} ${		+ `${nodeBinary} --require ${fixture('cluster-preload.js')} ${
+ fixture('cluster-preload-test.js')}`,		+ fixture('cluster-preload-test.js')}`,
function(err, stdout, stderr) {		function(err, stdout, stderr) {
assert.ifError(err);	<>	if (err) throw err;
assert.ok(/worker terminated with code 43/.test(stdout));	=	assert.ok(/worker terminated with code 43/.test(stdout));
diff --git a/test/parallel/test-process-exit-code.js b/test/parallel/test-process-exit-code.js		diff --git a/test/parallel/test-process-exit-code.js b/test/parallel/test-process-exit-code.js
index 284725293f0..e84be0aeadc 100644		index 8d0ed1b33ba..a956ee19310 100644
--- a/test/parallel/test-process-exit-code.js		--- a/test/parallel/test-process-exit-code.js
+++ b/test/parallel/test-process-exit-code.js		+++ b/test/parallel/test-process-exit-code.js
@@ -96,9 +96,9 @@ function test(arg, exit) {		@@ -75,9 +75,9 @@ function test(arg, exit) {
const f = __filename;		const f = __filename;
const option = { stdio: [ 0, 1, 'ignore' ] };		const option = { stdio: [ 0, 1, 'ignore' ] };
spawn(node, [f, arg], option).on('exit', function(code) {		spawn(node, [f, arg], option).on('exit', function(code) {
- assert.strictEqual(code, exit, 'wrong exit for ' +		- assert.strictEqual(code, exit, 'wrong exit for ' +

function parent() {	=	function parent() {
@@ -46,7 +46,7 @@ function parent() {		@@ -25,7 +25,7 @@ function parent() {
child.stderr.setEncoding('utf8');		child.stderr.setEncoding('utf8');

child.stderr.on('end', function() {		child.stderr.on('end', function() {
- assert.strictEqual(output, 'I can still debug!' + os.EOL);		- assert.strictEqual(output, 'I can still debug!' + os.EOL);
+ assert.strictEqual(output, `I can still debug!${os.EOL}`);		+ assert.strictEqual(output, `I can still debug!${os.EOL}`);
console.log('ok - got expected message');		console.log('ok - got expected message');
});		});

diff --git a/test/parallel/test-process-redirect-warnings-env.js b/test/parallel/test-process-redirect-warnings-env.js	+-
index 86942dc9e88..ae21cff3780 100644	=
--- a/test/parallel/test-process-redirect-warnings-env.js	+-
+++ b/test/parallel/test-process-redirect-warnings-env.js
@@ -13,7 +13,7 @@ const assert = require('assert');	=

common.refreshTmpDir();	+-
	=
-const warnmod = require.resolve(common.fixturesDir + '/warnings.js');	+-
+const warnmod = require.resolve(`${common.fixturesDir}/warnings.js`);
const warnpath = path.join(common.tmpDir, 'warnings.txt');
	=
fork(warnmod, {env: {NODE_REDIRECT_WARNINGS: warnpath}})	+-
diff --git a/test/parallel/test-process-redirect-warnings.js b/test/parallel/test-process-redirect-warnings.js
index b798e41bf6b..b1097469b22 100644	=
--- a/test/parallel/test-process-redirect-warnings.js	+-
+++ b/test/parallel/test-process-redirect-warnings.js
@@ -13,7 +13,7 @@ const assert = require('assert');	=

common.refreshTmpDir();	+-
	=
-const warnmod = require.resolve(common.fixturesDir + '/warnings.js');	+-
+const warnmod = require.resolve(`${common.fixturesDir}/warnings.js`);
const warnpath = path.join(common.tmpDir, 'warnings.txt');
	=
fork(warnmod, {execArgv: [`--redirect-warnings=${warnpath}`]})	+-
diff --git a/test/parallel/test-promises-unhandled-rejections.js b/test/parallel/test-promises-unhandled-rejections.js	=	diff --git a/test/parallel/test-promises-unhandled-rejections.js b/test/parallel/test-promises-unhandled-rejections.js
index fb2404a9901..7a367920b0f 100644		index 31afa09a6c3..87dc743625a 100644
--- a/test/parallel/test-promises-unhandled-rejections.js		--- a/test/parallel/test-promises-unhandled-rejections.js
+++ b/test/parallel/test-promises-unhandled-rejections.js		+++ b/test/parallel/test-promises-unhandled-rejections.js
@@ -12,11 +12,11 @@ const asyncTest = (function() {		@@ -12,11 +12,11 @@ const asyncTest = (function() {

function fail(error) {		function fail(error) {
const stack = currentTest ?	<>	const stack = currentTest
- error.stack + '\nFrom previous event:\n' + currentTest.stack :		- ? error.stack + '\nFrom previous event:\n' + currentTest.stack
+ `${error.stack}\nFrom previous event:\n${currentTest.stack}` :		+ ? `${error.stack}\nFrom previous event:\n${currentTest.stack}`
error.stack;		: error.stack;
	=
if (currentTest)		if (currentTest)
- process.stderr.write('\'' + currentTest.description + '\' failed\n\n');		- process.stderr.write('\'' + currentTest.description + '\' failed\n\n');
+ process.stderr.write(`'${currentTest.description}' failed\n\n`);		+ process.stderr.write(`'${currentTest.description}' failed\n\n`);

process.stderr.write(stack);		process.stderr.write(stack);
process.exit(2);		process.exit(2);
diff --git a/test/parallel/test-querystring-maxKeys-non-finite.js b/test/parallel/test-querystring-maxKeys-non-finite.js		diff --git a/test/parallel/test-querystring-maxKeys-non-finite.js b/test/parallel/test-querystring-maxKeys-non-finite.js
index 3df381405d6..da72dbf17cf 100644		index 3df381405d6..da72dbf17cf 100644
--- a/test/parallel/test-querystring-maxKeys-non-finite.js		--- a/test/parallel/test-querystring-maxKeys-non-finite.js

},	=	},
{		{
env: { NODE_REPL_HISTORY_FILE: oldHistoryPath,		env: { NODE_REPL_HISTORY_FILE: oldHistoryPath,
NODE_REPL_HISTORY_SIZE: 1 },		NODE_REPL_HISTORY_SIZE: 1 },
test: [UP, UP, UP, CLEAR],		test: [UP, UP, UP, CLEAR],
- expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]		- expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]
+ expected: [prompt, convertMsg, prompt, `${prompt}'=^.^='`, prompt]		+ expected: [prompt, convertMsg, prompt, `${prompt}'=^.^='`, prompt]
},		},
{		{
env: { NODE_REPL_HISTORY: historyPathFail,		env: { NODE_REPL_HISTORY: historyPathFail,
diff --git a/test/parallel/test-repl-save-load.js b/test/parallel/test-repl-save-load.js	+-
index ade32659bf5..746f6f2b6cd 100644	=
--- a/test/parallel/test-repl-save-load.js	+-
+++ b/test/parallel/test-repl-save-load.js
@@ -45,11 +45,11 @@ const saveFileName = join(common.tmpDir, 'test.save.js');	=
putIn.run(testFile);	+-
	=
// save it to a file	+-
-putIn.run(['.save ' + saveFileName]);
+putIn.run([`.save ${saveFileName}`]);
	=
// the file should have what I wrote	+-
-assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'), testFile.join('\n') +
- '\n');
+assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
+ `${testFile.join('\n')}\n`);
	=
{	+-
// save .editor mode code
@@ -81,7 +81,7 @@ testMe.complete('inner.o', function(error, data) {	=
putIn.run(['.clear']);	+-
	=
// Load the file back in	+-
-putIn.run(['.load ' + saveFileName]);
+putIn.run([`.load ${saveFileName}`]);
	=
// make sure that the REPL data is "correct"	+-
testMe.complete('inner.o', function(error, data) {
@@ -96,20 +96,19 @@ let loadFile = join(common.tmpDir, 'file.does.not.exist');	=
// should not break	+-
putIn.write = function(data) {
// make sure I get a failed to load message and not some crazy error
- assert.strictEqual(data, 'Failed to load:' + loadFile + '\n');
+ assert.strictEqual(data, `Failed to load:${loadFile}\n`);
// eat me to avoid work
putIn.write = common.noop;
};
-putIn.run(['.load ' + loadFile]);
+putIn.run([`.load ${loadFile}`]);
	=
// throw error on loading directory	+-
loadFile = common.tmpDir;
putIn.write = function(data) {
- assert.strictEqual(data, 'Failed to load:' + loadFile +
- ' is not a valid file\n');
+ assert.strictEqual(data, `Failed to load:${loadFile} is not a valid file\n`);
putIn.write = common.noop;
};
-putIn.run(['.load ' + loadFile]);
+putIn.run([`.load ${loadFile}`]);
	=
// clear the REPL	+-
putIn.run(['.clear']);
@@ -121,10 +120,10 @@ const invalidFileName = join(common.tmpDir, '\0\0\0\0\0');	=
// should not break	+-
putIn.write = function(data) {
// make sure I get a failed to save message and not some other error
- assert.strictEqual(data, 'Failed to save:' + invalidFileName + '\n');
+ assert.strictEqual(data, `Failed to save:${invalidFileName}\n`);
// reset to no-op
putIn.write = common.noop;
};
	=
// save it to a file	+-
-putIn.run(['.save ' + invalidFileName]);
+putIn.run([`.save ${invalidFileName}`]);
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js	=	diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
index b0ff850edde..6df0d81f8d7 100644		index 2eca418acb0..e2b9b363fa5 100644
--- a/test/parallel/test-repl-tab-complete.js		--- a/test/parallel/test-repl-tab-complete.js
+++ b/test/parallel/test-repl-tab-complete.js		+++ b/test/parallel/test-repl-tab-complete.js
@@ -207,7 +207,7 @@ putIn.run(['.clear']);		@@ -186,7 +186,7 @@ putIn.run(['.clear']);
testMe.complete('require(\'', common.mustCall(function(error, data) {		testMe.complete('require(\'', common.mustCall(function(error, data) {
assert.strictEqual(error, null);		assert.strictEqual(error, null);
repl._builtinLibs.forEach(function(lib) {		repl._builtinLibs.forEach(function(lib) {
- assert.notStrictEqual(data[0].indexOf(lib), -1, lib + ' not found');		- assert.notStrictEqual(data[0].indexOf(lib), -1, lib + ' not found');
+ assert.notStrictEqual(data[0].indexOf(lib), -1, `${lib} not found`);		+ assert.notStrictEqual(data[0].indexOf(lib), -1, `${lib} not found`);

{	=	{
client: client_unix, send: '(function() {\nreturn /foo/ / /bar/;\n}())',		client: client_unix, send: '(function() {\nreturn /foo/ / /bar/;\n}())',
- expect: prompt_multiline + prompt_multiline + 'NaN\n' + prompt_unix		- expect: prompt_multiline + prompt_multiline + 'NaN\n' + prompt_unix
+ expect: `${prompt_multiline}${prompt_multiline}NaN\n${prompt_unix}`		+ expect: `${prompt_multiline}${prompt_multiline}NaN\n${prompt_unix}`
},		},

{		{
client: client_unix, send: '(function() {\nif (false) {} /bar"/;\n}())',		client: client_unix, send: '(function() {\nif (false) {} /bar"/;\n}())',
- expect: prompt_multiline + prompt_multiline + 'undefined\n' + prompt_unix		- expect: prompt_multiline + prompt_multiline + 'undefined\n' + prompt_unix
+ expect: `${prompt_multiline}${prompt_multiline}undefined\n${prompt_unix}`		+ expect: `${prompt_multiline}${prompt_multiline}undefined\n${prompt_unix}`
},	<>	}
		]);
		}
// Newline within template string maintains whitespace.
{ client: client_unix, send: '`foo \n`',
- expect: prompt_multiline + '\'foo \\n\'\n' + prompt_unix },
+ expect: `${prompt_multiline}'foo \\n'\n${prompt_unix}` },
// Whitespace is not evaluated.
{ client: client_unix, send: ' \t \n',
expect: prompt_unix }
@@ -445,15 +446,15 @@ function tcp_test() {	=	@@ -418,15 +419,15 @@ function tcp_test() {
{ client: client_tcp, send: 'a += 1',		{ client: client_tcp, send: 'a += 1',
expect: (`12346\n${prompt_tcp}`) },		expect: (`12346\n${prompt_tcp}`) },
{ client: client_tcp,		{ client: client_tcp,
- send: 'require(' + JSON.stringify(moduleFilename) + ').number',		- send: 'require(' + JSON.stringify(moduleFilename) + ').number',
+ send: `require(${JSON.stringify(moduleFilename)}).number`,		+ send: `require(${JSON.stringify(moduleFilename)}).number`,
expect: (`42\n${prompt_tcp}`) }		expect: (`42\n${prompt_tcp}`) }
]);		]);
});		});


index 3b2602ae9c4..db34a036e45 100644	=	index f1dc26b4cef..004878ac741 100644
--- a/test/parallel/test-signal-handler.js		--- a/test/parallel/test-signal-handler.js
+++ b/test/parallel/test-signal-handler.js		+++ b/test/parallel/test-signal-handler.js
@@ -28,7 +28,7 @@ if (common.isWindows) {		@@ -7,7 +7,7 @@ if (common.isWindows) {
return;		return;
}		}

-console.log('process.pid: ' + process.pid);		-console.log('process.pid: ' + process.pid);
+console.log(`process.pid: ${process.pid}`);		+console.log(`process.pid: ${process.pid}`);

process.on('SIGUSR1', common.mustCall());	<>	process.on('SIGUSR1', common.mustCall(function() {}));
	=
@@ -41,7 +41,7 @@ process.on('SIGUSR1', common.mustCall(function() {		@@ -20,7 +20,7 @@ process.on('SIGUSR1', common.mustCall(function() {

let i = 0;		let i = 0;
setInterval(function() {		setInterval(function() {
- console.log('running process...' + ++i);		- console.log('running process...' + ++i);
+ console.log(`running process...${++i}`);		+ console.log(`running process...${++i}`);

if (i === 5) {		if (i === 5) {
process.kill(process.pid, 'SIGUSR1');		process.kill(process.pid, 'SIGUSR1');

+++ b/test/parallel/test-stream-base-no-abort.js	=	+++ b/test/parallel/test-stream-base-no-abort.js
@@ -42,8 +42,8 @@ async_wrap.enable();		@@ -37,8 +37,8 @@ async_wrap.enable();

const checkTLS = common.mustCall(function checkTLS() {		const checkTLS = common.mustCall(function checkTLS() {
const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/ec-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/ec-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/ec-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/ec-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)
};		};
const server = tls.createServer(options, common.noop)	<>	const server = tls.createServer(options, () => {})
.listen(0, function() {	=	.listen(0, function() {
diff --git a/test/parallel/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js		diff --git a/test/parallel/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js
index af7132545b5..2c2d2ec4676 100644		index e77d8a48c67..7ccda9246c3 100644
--- a/test/parallel/test-stream-push-strings.js		--- a/test/parallel/test-stream-push-strings.js
+++ b/test/parallel/test-stream-push-strings.js		+++ b/test/parallel/test-stream-push-strings.js
@@ -56,7 +56,7 @@ const results = [];		@@ -35,7 +35,7 @@ const results = [];
ms.on('readable', function() {		ms.on('readable', function() {
let chunk;		let chunk;
while (null !== (chunk = ms.read()))		while (null !== (chunk = ms.read()))
- results.push(chunk + '');		- results.push(chunk + '');

@@ -12,8 +12,8 @@ const tls = require('tls');	=	@@ -12,8 +12,8 @@ const tls = require('tls');
const fs = require('fs');		const fs = require('fs');

const server = tls.createServer({		const server = tls.createServer({
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
}, function(c) {		}, function(c) {
}).listen(0, common.mustCall(function() {		}).listen(0, common.mustCall(function() {
const c = tls.connect(this.address().port, common.mustNotCall());	<>	const c = tls.connect(this.address().port, function() {
diff --git a/test/parallel/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js	=	diff --git a/test/parallel/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js
index 9737c80effc..625909c9c5e 100644		index 5d5bc100774..2a6776b0b18 100644
--- a/test/parallel/test-tls-close-notify.js		--- a/test/parallel/test-tls-close-notify.js
+++ b/test/parallel/test-tls-close-notify.js		+++ b/test/parallel/test-tls-close-notify.js
@@ -31,8 +31,8 @@ const tls = require('tls');		@@ -10,8 +10,8 @@ const tls = require('tls');
const fs = require('fs');		const fs = require('fs');

const server = tls.createServer({		const server = tls.createServer({
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')

diff --git a/test/parallel/test-tls-two-cas-one-string.js b/test/parallel/test-tls-two-cas-one-string.js	=	diff --git a/test/parallel/test-tls-two-cas-one-string.js b/test/parallel/test-tls-two-cas-one-string.js
index 3d4703ce9d5..35d0a01f058 100644		index 406acec7c5d..10d626ba6e1 100644
--- a/test/parallel/test-tls-two-cas-one-string.js		--- a/test/parallel/test-tls-two-cas-one-string.js
+++ b/test/parallel/test-tls-two-cas-one-string.js		+++ b/test/parallel/test-tls-two-cas-one-string.js
@@ -35,5 +35,5 @@ function test(ca, next) {		@@ -30,5 +30,5 @@ function test(ca, next) {
}		}

const array = [ca1, ca2];		const array = [ca1, ca2];
-const string = ca1 + '\n' + ca2;		-const string = ca1 + '\n' + ca2;
+const string = `${ca1}\n${ca2}`;		+const string = `${ca1}\n${ca2}`;
test(array, () => test(string, common.noop));	<>	test(array, () => test(string, () => {}));
diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js	=	diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js
index d66e1f2d680..64fbcc7fc7f 100644		index d66e1f2d680..64fbcc7fc7f 100644
--- a/test/parallel/test-tls-wrap-timeout.js		--- a/test/parallel/test-tls-wrap-timeout.js
+++ b/test/parallel/test-tls-wrap-timeout.js		+++ b/test/parallel/test-tls-wrap-timeout.js
@@ -12,8 +12,8 @@ const net = require('net');		@@ -12,8 +12,8 @@ const net = require('net');
const fs = require('fs');		const fs = require('fs');

const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

const server = tls.createServer(options, common.mustCall((c) => {		const server = tls.createServer(options, common.mustCall((c) => {
diff --git a/test/parallel/test-url-format.js b/test/parallel/test-url-format.js	+-
index 077ced5a078..af5632d0b61 100644	=
--- a/test/parallel/test-url-format.js	+-
+++ b/test/parallel/test-url-format.js
@@ -251,10 +251,8 @@ for (const u in formatTests) {	=
const actual = url.format(u);	+-
const actualObj = url.format(formatTests[u]);
assert.strictEqual(actual, expect,
- 'wonky format(' + u + ') == ' + expect +
- '\nactual:' + actual);
+ `wonky format(${u}) == ${expect}\nactual:${actual}`);
assert.strictEqual(actualObj, expect,
- 'wonky format(' + JSON.stringify(formatTests[u]) +
- ') == ' + expect +
- '\nactual: ' + actualObj);
+ `wonky format(${JSON.stringify(formatTests[u])}) == ${
+ expect}\nactual: ${actualObj}`);
}
diff --git a/test/parallel/test-url-parse-format.js b/test/parallel/test-url-parse-format.js
index 7da6a7167b5..0e12fe52516 100644	=
--- a/test/parallel/test-url-parse-format.js	+-
+++ b/test/parallel/test-url-parse-format.js
@@ -919,5 +919,5 @@ for (const u in parseTests) {	=
actual = url.format(parseTests[u]);	+-
	=
assert.strictEqual(actual, expected,	+-
- 'format(' + u + ') == ' + u + '\nactual:' + actual);
+ `format(${u}) == ${u}\nactual:${actual}`);
}
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js	=	diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
index d44bb8b870f..c8ee5f72edb 100644		index eeb7ccff17f..177d46f5f65 100644
--- a/test/parallel/test-util-inspect.js		--- a/test/parallel/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js		+++ b/test/parallel/test-util-inspect.js
@@ -514,8 +514,7 @@ assert.doesNotThrow(() => {		@@ -443,8 +443,7 @@ function test_color_style(style, input, implicit) {

const withoutColor = util.inspect(input, false, 0, false);	<>	const without_color = util.inspect(input, false, 0, false);
const withColor = util.inspect(input, false, 0, true);		const with_color = util.inspect(input, false, 0, true);
- const expect = '\u001b[' + color[0] + 'm' + withoutColor +		- const expect = '\u001b[' + color[0] + 'm' + without_color +
- '\u001b[' + color[1] + 'm';	=	- '\u001b[' + color[1] + 'm';
+ const expect = `\u001b[${color[0]}m${withoutColor}\u001b[${color[1]}m`;	<>	+ const expect = `\u001b[${color[0]}m${without_color}\u001b[${color[1]}m`;
assert.strictEqual(	=	assert.strictEqual(
withColor,	<>	with_color,
expect,	=	expect,
diff --git a/test/parallel/test-vm-cached-data.js b/test/parallel/test-vm-cached-data.js		diff --git a/test/parallel/test-vm-cached-data.js b/test/parallel/test-vm-cached-data.js
index f18bf9f5409..59cdca9c99f 100644		index 8dc1fa25756..c4fa55cb0b2 100644
--- a/test/parallel/test-vm-cached-data.js		--- a/test/parallel/test-vm-cached-data.js
+++ b/test/parallel/test-vm-cached-data.js		+++ b/test/parallel/test-vm-cached-data.js
@@ -32,7 +32,7 @@ function produce(source, count) {		@@ -32,7 +32,7 @@ function produce(source, count) {
console.log(data);		console.log(data);
`, source]);		`, source]);

- assert.strictEqual(out.status, 0, out.stderr + '');		- assert.strictEqual(out.status, 0, out.stderr + '');

const data = [];	=	const data = [];
proc.stdout.on('data', common.mustNotCall());		proc.stdout.on('data', common.mustNotCall());
diff --git a/test/parallel/test-vm-syntax-error-stderr.js b/test/parallel/test-vm-syntax-error-stderr.js		diff --git a/test/parallel/test-vm-syntax-error-stderr.js b/test/parallel/test-vm-syntax-error-stderr.js
index af0df0202f4..805bea0f874 100644		index 43ed8d88280..9cba2178e3a 100644
--- a/test/parallel/test-vm-syntax-error-stderr.js		--- a/test/parallel/test-vm-syntax-error-stderr.js
+++ b/test/parallel/test-vm-syntax-error-stderr.js		+++ b/test/parallel/test-vm-syntax-error-stderr.js
@@ -13,7 +13,7 @@ const p = child_process.spawn(process.execPath, [		@@ -13,7 +13,7 @@ const p = child_process.spawn(process.execPath, [
]);		]);

p.stdout.on('data', function(data) {		p.stdout.on('data', function(data) {
- assert.fail('Unexpected stdout data: ' + data);	<>	- common.fail('Unexpected stdout data: ' + data);
+ assert.fail(`Unexpected stdout data: ${data}`);		+ common.fail(`Unexpected stdout data: ${data}`);
});	=	});

let output = '';		let output = '';
diff --git a/test/parallel/test-zlib-convenience-methods.js b/test/parallel/test-zlib-convenience-methods.js		diff --git a/test/parallel/test-zlib-convenience-methods.js b/test/parallel/test-zlib-convenience-methods.js
index 78bb105906f..5612575d8e7 100644		index 9b9419c7bfa..ecb556e8376 100644
--- a/test/parallel/test-zlib-convenience-methods.js		--- a/test/parallel/test-zlib-convenience-methods.js
+++ b/test/parallel/test-zlib-convenience-methods.js		+++ b/test/parallel/test-zlib-convenience-methods.js
@@ -66,8 +66,8 @@ for (const [type, expect] of [		@@ -23,8 +23,8 @@ const opts = {
	<>	zlib[method[0]](expect, opts, function(err, result) {
		zlib[method[1]](result, opts, function(err, result) {
		assert.strictEqual(result.toString(), expect,
		- 'Should get original string after ' +
		- method[0] + '/' + method[1] + ' with options.');
		+ `Should get original string after ${
		+ method[0]}/${method[1]} with options.`);
		hadRun++;
}));		});
		});
	=	@@ -32,24 +32,24 @@ const opts = {
	-+	zlib[method[0]](expect, function(err, result) {
		zlib[method[1]](result, function(err, result) {
		assert.strictEqual(result.toString(), expect,
		- 'Should get original string after ' +
		- method[0] + '/' + method[1] + ' without options.');
		+ `Should get original string after ${
		+ method[0]}/${method[1]} without options.`);
		hadRun++;
		});
		});
	=
{	<>
- const compressed = zlib[method[0] + 'Sync'](expect, opts);		- let result = zlib[method[0] + 'Sync'](expect, opts);
- const decompressed = zlib[method[1] + 'Sync'](compressed, opts);		- result = zlib[method[1] + 'Sync'](result, opts);
+ const compressed = zlib[`${method[0]}Sync`](expect, opts);		+ let result = zlib[`${method[0]}Sync`](expect, opts);
+ const decompressed = zlib[`${method[1]}Sync`](compressed, opts);		+ result = zlib[`${method[1]}Sync`](result, opts);
assert.strictEqual(decompressed.toString(), expectStr,		assert.strictEqual(result.toString(), expect,
		- 'Should get original string after ' +
		- method[0] + '/' + method[1] + ' with options.');
`Should get original string after ${method[0]}Sync/` +		+ `Should get original string after ${
`${method[1]}Sync ${type} with options.`);		+ method[0]}/${method[1]} with options.`);
@@ -75,8 +75,8 @@ for (const [type, expect] of [		hadRun++;
	=

{	<>
- const compressed = zlib[method[0] + 'Sync'](expect);		- result = zlib[method[0] + 'Sync'](expect);
- const decompressed = zlib[method[1] + 'Sync'](compressed);		- result = zlib[method[1] + 'Sync'](result);
+ const compressed = zlib[`${method[0]}Sync`](expect);		+ result = zlib[`${method[0]}Sync`](expect);
+ const decompressed = zlib[`${method[1]}Sync`](compressed);		+ result = zlib[`${method[1]}Sync`](result);
assert.strictEqual(decompressed.toString(), expectStr,		assert.strictEqual(result.toString(), expect,
		- 'Should get original string after ' +
		- method[0] + '/' + method[1] + ' without options.');
`Should get original string after ${method[0]}Sync/` +		+ `Should get original string after ${
`${method[1]}Sync ${type} without options.`);		+ method[0]}/${method[1]} without options.`);
diff --git a/test/parallel/test-zlib-deflate-constructors.js b/test/parallel/test-zlib-deflate-constructors.js		hadRun++;
index d34bb869e3d..01930b27207 100644	=
--- a/test/parallel/test-zlib-deflate-constructors.js	+-
+++ b/test/parallel/test-zlib-deflate-constructors.js
@@ -88,7 +88,7 @@ assert.doesNotThrow(	=

// Throws if opt.strategy is the wrong type.	<>
assert.throws(
- () => { new zlib.Deflate({strategy: '' + zlib.constants.Z_RLE }); },
+ () => { new zlib.Deflate({ strategy: String(zlib.constants.Z_RLE) }); },
/^TypeError: Invalid strategy: 3$/
);		});
	=
diff --git a/test/parallel/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js		diff --git a/test/parallel/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js
index 97070dcba40..a69df87a97f 100644		index ac01fc03d11..7bd377eb869 100644
--- a/test/parallel/test-zlib-from-gzip.js		--- a/test/parallel/test-zlib-from-gzip.js
+++ b/test/parallel/test-zlib-from-gzip.js		+++ b/test/parallel/test-zlib-from-gzip.js
@@ -46,6 +46,6 @@ out.on('close', function() {		@@ -25,6 +25,6 @@ out.on('close', function() {
const actual = fs.readFileSync(outputFile);		const actual = fs.readFileSync(outputFile);
assert.strictEqual(actual.length, expect.length, 'length should match');		assert.strictEqual(actual.length, expect.length, 'length should match');
for (let i = 0, l = actual.length; i < l; i++) {		for (let i = 0, l = actual.length; i < l; i++) {
- assert.strictEqual(actual[i], expect[i], 'byte[' + i + ']');		- assert.strictEqual(actual[i], expect[i], 'byte[' + i + ']');

// 1000 bytes wrapped at 50 columns	=	// 1000 bytes wrapped at 50 columns
// \n turns into a double-byte character		// \n turns into a double-byte character
// (48 + {2}) * 20 = 1000		// (48 + {2}) * 20 = 1000
-let out = ('o'.repeat(48) + '\n').repeat(20);		-let out = ('o'.repeat(48) + '\n').repeat(20);
+let out = `${'o'.repeat(48)}\n`.repeat(20);		+let out = `${'o'.repeat(48)}\n`.repeat(20);
// Add the remaining 24 bytes and terminate with an 'O'.		// Add the remaining 24 bytes and terminate with an 'O'.
// This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer.		// This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer.
-out += 'o'.repeat(24) + 'O';		-out += 'o'.repeat(24) + 'O';
+out += `${'o'.repeat(24)}O`;		+out += `${'o'.repeat(24)}O`;

// In AIX, the child exits even before the python parent	<>	process.stdout.write(out);
// can setup the readloop. Provide a reasonable delay.		process.exit(0);
diff --git a/test/pseudo-tty/no_interleaved_stdio.js b/test/pseudo-tty/no_interleaved_stdio.js	=	diff --git a/test/pseudo-tty/no_interleaved_stdio.js b/test/pseudo-tty/no_interleaved_stdio.js
index ba3989f9387..3f1e7b5fb12 100644		index ff3ed8594a0..3dc7992d688 100644
--- a/test/pseudo-tty/no_interleaved_stdio.js		--- a/test/pseudo-tty/no_interleaved_stdio.js
+++ b/test/pseudo-tty/no_interleaved_stdio.js		+++ b/test/pseudo-tty/no_interleaved_stdio.js
@@ -6,10 +6,10 @@ const common = require('../common');		@@ -6,10 +6,10 @@ require('../common');
// 1000 bytes wrapped at 50 columns		// 1000 bytes wrapped at 50 columns
// \n turns into a double-byte character		// \n turns into a double-byte character
// (48 + {2}) * 20 = 1000		// (48 + {2}) * 20 = 1000
-let out = ('o'.repeat(48) + '\n').repeat(20);		-let out = ('o'.repeat(48) + '\n').repeat(20);
+let out = `${'o'.repeat(48)}\n`.repeat(20);		+let out = `${'o'.repeat(48)}\n`.repeat(20);

- console.log('secure error: ' + err);	=	- console.log('secure error: ' + err);
+ console.log(`secure error: ${err}`);		+ console.log(`secure error: ${err}`);
});		});
}		}

diff --git a/test/pummel/test-tls-server-large-request.js b/test/pummel/test-tls-server-large-request.js		diff --git a/test/pummel/test-tls-server-large-request.js b/test/pummel/test-tls-server-large-request.js
index a88ee5870e7..021fb7913b5 100644		index 0569dd47cfd..4d1065a790d 100644
--- a/test/pummel/test-tls-server-large-request.js		--- a/test/pummel/test-tls-server-large-request.js
+++ b/test/pummel/test-tls-server-large-request.js		+++ b/test/pummel/test-tls-server-large-request.js
@@ -36,8 +36,8 @@ const util = require('util');		@@ -15,8 +15,8 @@ const util = require('util');
const request = Buffer.from('ABCD'.repeat(1024 * 256 - 1)); // 1mb	<>	const request = Buffer.from(new Array(1024 * 256).join('ABCD')); // 1mb
	=
const options = {		const options = {
- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),		- key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')		- cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),		+ key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)		+ cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
};		};

function Mediator() {		function Mediator() {
diff --git a/test/pummel/test-tls-session-timeout.js b/test/pummel/test-tls-session-timeout.js		diff --git a/test/pummel/test-tls-session-timeout.js b/test/pummel/test-tls-session-timeout.js

+ assert.strictEqual(require(`${loadOrder}file4`).file4, 'file4.reg', msg);	=	+assert.strictEqual(require(`${loadOrder}file4`).file4, 'file4.reg', msg);
+ assert.strictEqual(require(`${loadOrder}file5`).file5, 'file5.reg2', msg);		+assert.strictEqual(require(`${loadOrder}file5`).file5, 'file5.reg2', msg);
+ assert.strictEqual(require(`${loadOrder}file6`).file6, 'file6/index.js', msg);		+assert.strictEqual(require(`${loadOrder}file6`).file6, 'file6/index.js', msg);
try {		try {
- require(loadOrder + 'file7');		- require(loadOrder + 'file7');
+ require(`${loadOrder}file7`);		+ require(`${loadOrder}file7`);
} catch (e) {		} catch (e) {
assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));		assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));
}		}
- assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg',		-assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
	-+	-assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
+ assert.strictEqual(require(`${loadOrder}file8`).file8, 'file8/index.reg',	=	+assert.strictEqual(require(`${loadOrder}file8`).file8, 'file8/index.reg', msg);
msg);	+-
- assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2',
+ assert.strictEqual(require(`${loadOrder}file9`).file9, 'file9/index.reg2',	=	+assert.strictEqual(require(`${loadOrder}file9`).file9, 'file9/index.reg2', msg);
msg);	<>
}
	=
	-+	// make sure that module.require() is the same as
diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js	=	diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js
index 9c60b6f568b..0c4d9bc6940 100644		index a7f64c2e73d..bd0943f9e01 100644
--- a/test/sequential/test-net-GH-5504.js		--- a/test/sequential/test-net-GH-5504.js
+++ b/test/sequential/test-net-GH-5504.js		+++ b/test/sequential/test-net-GH-5504.js
@@ -92,7 +92,7 @@ function parent() {		@@ -71,7 +71,7 @@ function parent() {
inp.on('data', function(c) {		inp.on('data', function(c) {
c = c.trim();		c = c.trim();
if (!c) return;		if (!c) return;
- out.write(w + c.split('\n').join('\n' + w) + '\n');		- out.write(w + c.split('\n').join('\n' + w) + '\n');
+ out.write(`${w}${c.split('\n').join(`\n${w}`)}\n`);		+ out.write(`${w}${c.split('\n').join(`\n${w}`)}\n`);
});		});
}		}
}		}
	-+	diff --git a/test/sequential/test-net-listen-shared-ports.js b/test/sequential/test-net-listen-shared-ports.js
	=	index e7bc036ff39..243a9657224 100644
	-+	--- a/test/sequential/test-net-listen-shared-ports.js
		+++ b/test/sequential/test-net-listen-shared-ports.js
	=	@@ -25,12 +25,12 @@ if (cluster.isMaster) {

	-+	server1.on('error', function(err) {
		// no errors expected
		- process.send('server1:' + err.code);
		+ process.send(`server1:${err.code}`);
		});
	=
	-+	server2.on('error', function(err) {
		// an error is expected on the second worker
		- process.send('server2:' + err.code);
		+ process.send(`server2:${err.code}`);
		});
	=
	-+	server1.listen({
diff --git a/test/sequential/test-process-warnings.js b/test/sequential/test-process-warnings.js	=	diff --git a/test/sequential/test-process-warnings.js b/test/sequential/test-process-warnings.js
index 83952a29337..0ab8652f561 100644		index d4894f8bffe..9eaa45bd38c 100644
--- a/test/sequential/test-process-warnings.js		--- a/test/sequential/test-process-warnings.js
+++ b/test/sequential/test-process-warnings.js		+++ b/test/sequential/test-process-warnings.js
@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
const common = require('../common');		const common = require('../common');
const assert = require('assert');		const assert = require('assert');
const execFile = require('child_process').execFile;		const execFile = require('child_process').execFile;
-const warnmod = require.resolve(common.fixturesDir + '/warnings.js');		-const warnmod = require.resolve(common.fixturesDir + '/warnings.js');
+const warnmod = require.resolve(`${common.fixturesDir}/warnings.js`);		+const warnmod = require.resolve(`${common.fixturesDir}/warnings.js`);