1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove needless RegExp flags

Browse Source 
* /m is needless if ^ and $ are not used
* /g is needless in split()
* /g is needless in test() with one-time RegExp/String

PR-URL: https://github.com/nodejs/node/pull/13690
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Vse Mozhet Byt 2017-06-15 03:33:50 +03:00
parent 3ad90a4ac8
commit d174e44c77
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/parallel/test-http-full-response.js
View File

@ -42,7 +42,7 @@ function runAb(opts, callback) {
const command = `ab ${opts} http://127.0.0.1:${server.address().port}/`; const command = `ab ${opts} http://127.0.0.1:${server.address().port}/`;
exec(command, function(err, stdout, stderr) { exec(command, function(err, stdout, stderr) {
if (err) { if (err) {
if (/ab|apr/mi.test(stderr)) { if (/ab|apr/i.test(stderr)) {
common.skip(`problem spawning \`ab\`.\n${stderr}`); common.skip(`problem spawning \`ab\`.\n${stderr}`);
process.reallyExit(0); process.reallyExit(0);
} }
@ -50,13 +50,13 @@ function runAb(opts, callback) {
return; return;
} }
let m = /Document Length:\s*(\d+) bytes/mi.exec(stdout); let m = /Document Length:\s*(\d+) bytes/i.exec(stdout);
const documentLength = parseInt(m[1]); const documentLength = parseInt(m[1]);
m = /Complete requests:\s*(\d+)/mi.exec(stdout); m = /Complete requests:\s*(\d+)/i.exec(stdout);
const completeRequests = parseInt(m[1]); const completeRequests = parseInt(m[1]);
m = /HTML transferred:\s*(\d+) bytes/mi.exec(stdout); m = /HTML transferred:\s*(\d+) bytes/i.exec(stdout);
const htmlTransfered = parseInt(m[1]); const htmlTransfered = parseInt(m[1]);
assert.strictEqual(bodyLength, documentLength); assert.strictEqual(bodyLength, documentLength);

2
test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js
View File

@ -24,7 +24,7 @@ for (const enc of ['utf8', 'utf16le', 'latin1', 'UTF-8']) {
const headerEnd = received.indexOf('\r\n\r\n', 'utf8'); const headerEnd = received.indexOf('\r\n\r\n', 'utf8');
assert.notStrictEqual(headerEnd, -1); assert.notStrictEqual(headerEnd, -1);
const header = received.toString('utf8', 0, headerEnd).split(/\r\n/g); const header = received.toString('utf8', 0, headerEnd).split(/\r\n/);
const body = received.toString(enc, headerEnd + 4); const body = received.toString(enc, headerEnd + 4);
assert.strictEqual(header[0], 'HTTP/1.1 200 OK'); assert.strictEqual(header[0], 'HTTP/1.1 200 OK');

2
test/parallel/test-tls-client-verify.js
View File

@ -31,7 +31,7 @@ const tls = require('tls');
const fs = require('fs'); const fs = require('fs');
const hosterr = /Hostname\/IP doesn't match certificate's altnames/g; const hosterr = /Hostname\/IP doesn't match certificate's altnames/;
const testCases = const testCases =
[{ ca: ['ca1-cert'], [{ ca: ['ca1-cert'],
key: 'agent2-key', key: 'agent2-key',

4
test/parallel/test-tls-server-verify.js
View File

@ -217,7 +217,7 @@ function runClient(prefix, port, options, cb) {
client.stdout.on('data', function(d) { client.stdout.on('data', function(d) {
out += d; out += d;
if (!goodbye && /_unauthed/g.test(out)) { if (!goodbye && /_unauthed/.test(out)) {
console.error(`${prefix} * unauthed`); console.error(`${prefix} * unauthed`);
goodbye = true; goodbye = true;
client.kill(); client.kill();
@ -225,7 +225,7 @@ function runClient(prefix, port, options, cb) {
rejected = false; rejected = false;
} }
if (!goodbye && /_authed/g.test(out)) { if (!goodbye && /_authed/.test(out)) {
console.error(`${prefix} * authed`); console.error(`${prefix} * authed`);
goodbye = true; goodbye = true;
client.kill(); client.kill();

2
test/parallel/test-util-callbackify.js
View File

@ -205,7 +205,7 @@ const values = [
assert.strictEqual(err.code, 1); assert.strictEqual(err.code, 1);
assert.strictEqual(Object.getPrototypeOf(err).name, 'Error'); assert.strictEqual(Object.getPrototypeOf(err).name, 'Error');
assert.strictEqual(stdout, ''); assert.strictEqual(stdout, '');
const errLines = stderr.trim().split(/[\r\n]+/g); const errLines = stderr.trim().split(/[\r\n]+/);
const errLine = errLines.find((l) => /^Error/.exec(l)); const errLine = errLines.find((l) => /^Error/.exec(l));
assert.strictEqual(errLine, `Error: ${fixture}`); assert.strictEqual(errLine, `Error: ${fixture}`);
}) })

4
test/pummel/test-keep-alive.js
View File

@ -79,10 +79,10 @@ function runAb(opts, callback) {
return; return;
} }
let matches = /Requests\/sec:\s*(\d+)\./mi.exec(stdout); let matches = /Requests\/sec:\s*(\d+)\./i.exec(stdout);
const reqSec = parseInt(matches[1]); const reqSec = parseInt(matches[1]);
matches = /Keep-Alive requests:\s*(\d+)/mi.exec(stdout); matches = /Keep-Alive requests:\s*(\d+)/i.exec(stdout);
let keepAliveRequests; let keepAliveRequests;
if (matches) { if (matches) {
keepAliveRequests = parseInt(matches[1]); keepAliveRequests = parseInt(matches[1]);

4
test/pummel/test-tls-securepair-client.js
View File

@ -84,7 +84,7 @@ function test(keyfn, certfn, check, next) {
console.error(state); console.error(state);
switch (state) { switch (state) {
case 'WAIT-ACCEPT': case 'WAIT-ACCEPT':
if (/ACCEPT/g.test(serverStdoutBuffer)) { if (/ACCEPT/.test(serverStdoutBuffer)) {
// Give s_server half a second to start up. // Give s_server half a second to start up.
setTimeout(startClient, 500); setTimeout(startClient, 500);
state = 'WAIT-HELLO'; state = 'WAIT-HELLO';
@ -92,7 +92,7 @@ function test(keyfn, certfn, check, next) {
break; break;
case 'WAIT-HELLO': case 'WAIT-HELLO':
if (/hello/g.test(serverStdoutBuffer)) { if (/hello/.test(serverStdoutBuffer)) {
// End the current SSL connection and exit. // End the current SSL connection and exit.
// See s_server(1ssl). // See s_server(1ssl).