Skip to content

Commit

Permalink
test: replace util with backtick strings
Browse files Browse the repository at this point in the history
Now that we have backticks we no longer need to use util.format
to template strings!

This commit was inspired by #3324, and it replaces instances of
util.format with backtick strings in a number of tests

Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #3359
  • Loading branch information
Myles Borins authored and jasnell committed Oct 26, 2015
1 parent 31a9ecf commit 41a4258
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 18 deletions.
3 changes: 1 addition & 2 deletions test/parallel/test-child-process-spawnsync-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
var common = require('../common');
var assert = require('assert');
var os = require('os');
var util = require('util');

var spawnSync = require('child_process').spawnSync;

Expand All @@ -15,7 +14,7 @@ var msgErrBuf = new Buffer(msgErr + '\n');

var args = [
'-e',
util.format('console.log("%s"); console.error("%s");', msgOut, msgErr)
`console.log("${msgOut}"); console.error("${msgErr}");`
];

var ret;
Expand Down
10 changes: 5 additions & 5 deletions test/parallel/test-child-process-spawnsync.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
'use strict';
var common = require('../common');
var assert = require('assert');
const common = require('../common');
const assert = require('assert');

var spawnSync = require('child_process').spawnSync;
const spawnSync = require('child_process').spawnSync;

// Echo does different things on Windows and Unix, but in both cases, it does
// more-or-less nothing if there are no parameters
var ret = spawnSync('sleep', ['0']);
const ret = spawnSync('sleep', ['0']);
assert.strictEqual(ret.status, 0, 'exit status should be zero');

// Error test when command does not exist
var ret_err = spawnSync('command_does_not_exist', ['bar']).error;
const ret_err = spawnSync('command_does_not_exist', ['bar']).error;

assert.strictEqual(ret_err.code, 'ENOENT');
assert.strictEqual(ret_err.errno, 'ENOENT');
Expand Down
11 changes: 5 additions & 6 deletions test/parallel/test-repl-setprompt.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use strict';
var common = require('../common'),
assert = require('assert'),
spawn = require('child_process').spawn,
os = require('os'),
util = require('util');
const common = require('../common');
const assert = require('assert');
const spawn = require('child_process').spawn;
const os = require('os');

var args = [
'-e',
Expand All @@ -19,7 +18,7 @@ child.stdout.setEncoding('utf8');
var data = '';
child.stdout.on('data', function(d) { data += d; });

child.stdin.end(util.format("e.setPrompt('%s');%s", p, os.EOL));
child.stdin.end(`e.setPrompt("${p}");${os.EOL}`);

child.on('close', function(code, signal) {
assert.strictEqual(code, 0);
Expand Down
10 changes: 5 additions & 5 deletions test/sequential/test-child-process-execsync.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';
var common = require('../common');
var assert = require('assert');
var util = require('util');
var os = require('os');

var execSync = require('child_process').execSync;
Expand All @@ -13,10 +12,10 @@ var SLEEP = 2000;
var start = Date.now();
var err;
var caught = false;

try
{
var cmd = util.format('"%s" -e "setTimeout(function(){}, %d);"',
process.execPath, SLEEP);
var cmd = `"${process.execPath}" -e "setTimeout(function(){}, ${SLEEP});"`;
var ret = execSync(cmd, {timeout: TIMER});
} catch (e) {
caught = true;
Expand All @@ -38,7 +37,8 @@ var msg = 'foobar';
var msgBuf = new Buffer(msg + '\n');

// console.log ends every line with just '\n', even on Windows.
cmd = util.format('"%s" -e "console.log(\'%s\');"', process.execPath, msg);

cmd = `"${process.execPath}" -e "console.log(\'${msg}\');"`;

var ret = execSync(cmd);

Expand All @@ -51,7 +51,7 @@ assert.strictEqual(ret, msg + '\n', 'execSync encoding result should match');

var args = [
'-e',
util.format('console.log("%s");', msg)
`console.log("${msg}");`
];
ret = execFileSync(process.execPath, args);

Expand Down

0 comments on commit 41a4258

Please sign in to comment.