Skip to content

Commit

Permalink
test: remove unneeded string splitting
Browse files Browse the repository at this point in the history
PR-URL: #12992
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Luca Maraschi <luca.maraschi@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
  • Loading branch information
vsemozhetbyt authored and addaleax committed May 15, 2017
1 parent 32f01c8 commit 88d2e69
Show file tree
Hide file tree
Showing 22 changed files with 57 additions and 63 deletions.
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-dgram-1.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const dgram = require('dgram');


if (common.isWindows) {
common.skip('dgram clustering is currently not supported ' +
'on windows.');
common.skip('dgram clustering is currently not supported on Windows.');
return;
}

Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-dgram-2.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const assert = require('assert');


if (common.isWindows) {
common.skip('dgram clustering is currently not supported ' +
'on windows.');
common.skip('dgram clustering is currently not supported on Windows.');
return;
}

Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-dgram-reuse.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ const cluster = require('cluster');
const dgram = require('dgram');

if (common.isWindows) {
common.skip('dgram clustering is currently not supported ' +
'on windows.');
common.skip('dgram clustering is currently not supported on windows.');
return;
}

Expand Down
5 changes: 3 additions & 2 deletions test/parallel/test-cluster-fork-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ if (cluster.isWorker) {

process.once('exit', function() {
assert.ok(checks.using, 'The worker did not receive the correct env.');
assert.ok(checks.overwrite, 'The custom environment did not overwrite ' +
'the existing environment.');
assert.ok(
checks.overwrite,
'The custom environment did not overwrite the existing environment.');
});

}
4 changes: 2 additions & 2 deletions test/parallel/test-cluster-http-pipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const cluster = require('cluster');
const http = require('http');

if (common.isWindows) {
common.skip('It is not possible to send pipe handles over ' +
'the IPC pipe on Windows');
common.skip(
'It is not possible to send pipe handles over the IPC pipe on Windows');
return;
}

Expand Down
9 changes: 4 additions & 5 deletions test/parallel/test-cluster-worker-isdead.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ const assert = require('assert');

if (cluster.isMaster) {
const worker = cluster.fork();
assert.ok(!worker.isDead(),
'isDead() should return false right after the worker has been ' +
'created.');
assert.ok(
!worker.isDead(),
'isDead() should return false right after the worker has been created.');

worker.on('exit', function() {
assert.ok(worker.isDead(),
'After an event has been emitted, ' +
'isDead should return true');
'After an event has been emitted, isDead should return true');
});

worker.on('message', function(msg) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-crypto-padding-aes256.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ crypto.DEFAULT_ENCODING = 'buffer';
function aes256(decipherFinal) {
const iv = Buffer.from('00000000000000000000000000000000', 'hex');
const key = Buffer.from('0123456789abcdef0123456789abcdef' +
'0123456789abcdef0123456789abcdef', 'hex');
'0123456789abcdef0123456789abcdef', 'hex');

function encrypt(val, pad) {
const c = crypto.createCipheriv('aes256', key, iv);
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-crypto-padding.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ const EVEN_LENGTH_ENCRYPTED =
// openssl enc -aes-128-cbc -e -K 5333632e722e652e742e4b2e652e5921 \
// -iv 626c616846697a7a3230313142757a7a -nopad | xxd -p -c256
const EVEN_LENGTH_ENCRYPTED_NOPAD =
'7f57859550d4d2fdb9806da2a750461ab46e' +
'71b3d78ebe2d9684dfc87f7575b9';
'7f57859550d4d2fdb9806da2a750461ab46e71b3d78ebe2d9684dfc87f7575b9';


/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const assert = require('assert');
const d = domain.create();

process.on('uncaughtException', common.mustCall(function onUncaught() {
assert.strictEqual(process.domain, null,
'domains stack should be empty in uncaughtException' +
' handler');
assert.strictEqual(
process.domain, null,
'domains stack should be empty in uncaughtException handler');
}));

process.on('beforeExit', common.mustCall(function onBeforeExit() {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-expect-continue.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ let sent_continue = false;
let got_continue = false;

function handler(req, res) {
assert.strictEqual(sent_continue, true, 'Full response sent before ' +
'100 Continue');
assert.strictEqual(sent_continue, true,
'Full response sent before 100 Continue');
console.error('Server sending full response...');
res.writeHead(200, {
'Content-Type': 'text/plain',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const server = http.createServer(function(request, response) {
});

server.listen(0, function() {
const testURL = url.parse('http://asdf:qwer@localhost:' +
`${this.address().port}`);
const testURL =
url.parse(`http://asdf:qwer@localhost:${this.address().port}`);
// the test here is if you set a specific authorization header in the
// request we should not override that with basic auth
testURL.headers = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ assert.throws(function() {
http.request(url.parse('file:///whatever'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "file:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "file:" not supported. Expected "http:"');
return true;
}
});
Expand All @@ -40,8 +40,8 @@ assert.throws(function() {
http.request(url.parse('mailto:asdf@asdf.com'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "mailto:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "mailto:" not supported. Expected "http:"');
return true;
}
});
Expand All @@ -50,8 +50,8 @@ assert.throws(function() {
http.request(url.parse('ftp://www.example.com'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "ftp:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "ftp:" not supported. Expected "http:"');
return true;
}
});
Expand All @@ -60,8 +60,8 @@ assert.throws(function() {
http.request(url.parse('javascript:alert(\'hello\');'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "javascript:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "javascript:" not supported. Expected "http:"');
return true;
}
});
Expand All @@ -70,8 +70,8 @@ assert.throws(function() {
http.request(url.parse('xmpp:isaacschlueter@jabber.org'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "xmpp:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "xmpp:" not supported. Expected "http:"');
return true;
}
});
Expand All @@ -80,8 +80,8 @@ assert.throws(function() {
http.request(url.parse('f://some.host/path'));
}, function(err) {
if (err instanceof Error) {
assert.strictEqual(err.message, 'Protocol "f:" not supported.' +
' Expected "http:"');
assert.strictEqual(
err.message, 'Protocol "f:" not supported. Expected "http:"');
return true;
}
});
4 changes: 2 additions & 2 deletions test/parallel/test-intl.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ if (!common.hasIntl) {

// If list is specified and doesn't contain 'en' then return.
if (process.config.variables.icu_locales && !haveLocale('en')) {
common.skip('detailed Intl tests because English is not ' +
'listed as supported.');
common.skip(
'detailed Intl tests because English is not listed as supported.');
// Smoke test. Does it format anything, or fail?
console.log(`Date(0) formatted to: ${dtf.format(date0)}`);
return;
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-alpn-server-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if (!common.hasCrypto) {
}

if (!process.features.tls_alpn || !process.features.tls_npn) {
common.skip('Skipping because node compiled without NPN or ALPN' +
' feature of OpenSSL.');
common.skip(
'Skipping because node compiled without NPN or ALPN feature of OpenSSL.');
return;
}

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-client-mindhsize.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ function test(size, err, next) {
if (err) {
client.on('error', function(e) {
nerror++;
assert.strictEqual(e.message, 'DH parameter size 1024 is less' +
' than 2048');
assert.strictEqual(e.message,
'DH parameter size 1024 is less than 2048');
server.close();
});
}
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-tls-npn-server-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
'use strict';
const common = require('../common');
if (!process.features.tls_npn) {
common.skip('Skipping because node compiled without NPN feature of' +
' OpenSSL.');
common.skip('Skipping because node compiled without NPN feature of OpenSSL.');
return;
}

Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-tls-ocsp-callback.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
const common = require('../common');

if (!process.features.tls_ocsp) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
common.skip('node compiled without OpenSSL or with old OpenSSL version.');
return;
}
if (!common.opensslCli) {
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-tls-sni-option.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
'use strict';
const common = require('../common');
if (!process.features.tls_sni) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
common.skip('node compiled without OpenSSL or with old OpenSSL version.');
return;
}

Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-tls-sni-server-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
'use strict';
const common = require('../common');
if (!process.features.tls_sni) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
common.skip('node compiled without OpenSSL or with old OpenSSL version.');
return;
}

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-url-format-invalid-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const throwsObjsAndReportTypes = new Map([
]);

for (const [obj, type] of throwsObjsAndReportTypes) {
const error = new RegExp('^TypeError: Parameter "urlObj" must be an object' +
`, not ${type}$`);
const error = new RegExp(
`^TypeError: Parameter "urlObj" must be an object, not ${type}$`);
assert.throws(function() { url.format(obj); }, error);
}
assert.strictEqual(url.format(''), '');
Expand Down
18 changes: 10 additions & 8 deletions test/parallel/test-zlib-flush-drain.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ deflater.on('drain', function() {
});

process.once('exit', function() {
assert.strictEqual(beforeFlush, true, 'before calling flush, writable ' +
'stream should need to drain');
assert.strictEqual(afterFlush, false, 'after calling flush, writable ' +
'stream should not need to drain');
assert.strictEqual(drainCount, 1,
'the deflater should have emitted a single drain event');
assert.strictEqual(flushCount, 2,
'flush should be called twice');
assert.strictEqual(
beforeFlush, true,
'before calling flush, writable stream should need to drain');
assert.strictEqual(
afterFlush, false,
'after calling flush, writable stream should not need to drain');
assert.strictEqual(
drainCount, 1, 'the deflater should have emitted a single drain event');
assert.strictEqual(
flushCount, 2, 'flush should be called twice');
});
4 changes: 2 additions & 2 deletions test/pummel/test-net-timeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const echo_server = net.createServer(function(socket) {
});

socket.on('error', function(e) {
throw new Error('Server side socket should not get error. ' +
'We disconnect willingly.');
throw new Error(
'Server side socket should not get error. We disconnect willingly.');
});

socket.on('data', function(d) {
Expand Down

0 comments on commit 88d2e69

Please sign in to comment.