Skip to content

Commit aaeeec4

Browse files
TrottMyles Borins
authored and
Myles Borins
committed
lib,test,tools: alignment on variable assignments
Correct alignment on variable assignments that span multiple lines in preparation for lint rule to enforce such alignment. PR-URL: #6869 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Johan Bergström <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent 3745d84 commit aaeeec4

22 files changed

+158
-144
lines changed

lib/child_process.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,10 @@ function checkExecSyncError(ret) {
458458
ret.error = null;
459459

460460
if (!err) {
461-
var msg = 'Command failed: ' +
462-
(ret.cmd ? ret.cmd : ret.args.join(' ')) +
463-
(ret.stderr ? '\n' + ret.stderr.toString() : '');
461+
var msg = 'Command failed: ';
462+
msg += ret.cmd || ret.args.join(' ');
463+
if (ret.stderr)
464+
msg += '\n' + ret.stderr.toString();
464465
err = new Error(msg);
465466
}
466467

lib/repl.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ exports._builtinLibs = ['assert', 'buffer', 'child_process', 'cluster',
7070
'string_decoder', 'tls', 'tty', 'url', 'util', 'v8', 'vm', 'zlib'];
7171

7272

73-
const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, ' +
74-
'const, function, class) not yet supported outside strict mode';
73+
const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, const, function, ' +
74+
'class) not yet supported outside strict mode';
7575

7676

7777
class LineParser {

lib/util.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,12 @@ function formatPrimitive(ctx, value) {
426426
var type = typeof value;
427427

428428
if (type === 'string') {
429-
var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
430-
.replace(/'/g, "\\'")
431-
.replace(/\\"/g, '"') + '\'';
429+
var simple = '\'' +
430+
JSON.stringify(value)
431+
.replace(/^"|"$/g, '')
432+
.replace(/'/g, "\\'")
433+
.replace(/\\"/g, '"') +
434+
'\'';
432435
return ctx.stylize(simple, 'string');
433436
}
434437
if (type === 'number') {

lib/zlib.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const binding = process.binding('zlib');
66
const util = require('util');
77
const assert = require('assert').ok;
88
const kMaxLength = require('buffer').kMaxLength;
9-
const kRangeErrorMessage = 'Cannot create final Buffer. ' +
10-
'It would be larger than 0x' + kMaxLength.toString(16) + ' bytes.';
9+
const kRangeErrorMessage = 'Cannot create final Buffer. It would be larger ' +
10+
'than 0x' + kMaxLength.toString(16) + ' bytes.';
1111

1212
// zlib doesn't provide these, so kludge them in following the same
1313
// const naming scheme zlib uses.

test/parallel/test-buffer.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -464,17 +464,17 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
464464
{
465465
// big example
466466
const quote = 'Man is distinguished, not only by his reason, but by this ' +
467-
'singular passion from other animals, which is a lust ' +
468-
'of the mind, that by a perseverance of delight in the ' +
469-
'continued and indefatigable generation of knowledge, exceeds ' +
470-
'the short vehemence of any carnal pleasure.';
467+
'singular passion from other animals, which is a lust ' +
468+
'of the mind, that by a perseverance of delight in the ' +
469+
'continued and indefatigable generation of knowledge, ' +
470+
'exceeds the short vehemence of any carnal pleasure.';
471471
const expected = 'TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb' +
472-
'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBh' +
473-
'bmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk' +
474-
'gYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIG' +
475-
'FuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBle' +
476-
'GNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVh' +
477-
'c3VyZS4=';
472+
'24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci' +
473+
'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ' +
474+
'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu' +
475+
'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ' +
476+
'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm' +
477+
'5hbCBwbGVhc3VyZS4=';
478478
assert.equal(expected, (new Buffer(quote)).toString('base64'));
479479

480480
let b = new Buffer(1024);
@@ -484,11 +484,11 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
484484

485485
// check that the base64 decoder ignores whitespace
486486
const expectedWhite = expected.slice(0, 60) + ' \n' +
487-
expected.slice(60, 120) + ' \n' +
488-
expected.slice(120, 180) + ' \n' +
489-
expected.slice(180, 240) + ' \n' +
490-
expected.slice(240, 300) + '\n' +
491-
expected.slice(300, 360) + '\n';
487+
expected.slice(60, 120) + ' \n' +
488+
expected.slice(120, 180) + ' \n' +
489+
expected.slice(180, 240) + ' \n' +
490+
expected.slice(240, 300) + '\n' +
491+
expected.slice(300, 360) + '\n';
492492
b = new Buffer(1024);
493493
bytesWritten = b.write(expectedWhite, 0, 'base64');
494494
assert.equal(quote.length, bytesWritten);
@@ -502,11 +502,11 @@ assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
502502

503503
// check that the base64 decoder ignores illegal chars
504504
const expectedIllegal = expected.slice(0, 60) + ' \x80' +
505-
expected.slice(60, 120) + ' \xff' +
506-
expected.slice(120, 180) + ' \x00' +
507-
expected.slice(180, 240) + ' \x98' +
508-
expected.slice(240, 300) + '\x03' +
509-
expected.slice(300, 360);
505+
expected.slice(60, 120) + ' \xff' +
506+
expected.slice(120, 180) + ' \x00' +
507+
expected.slice(180, 240) + ' \x98' +
508+
expected.slice(240, 300) + '\x03' +
509+
expected.slice(300, 360);
510510
b = new Buffer(expectedIllegal, 'base64');
511511
assert.equal(quote.length, b.length);
512512
assert.equal(quote, b.toString('ascii', 0, quote.length));

test/parallel/test-cluster-worker-exit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function checkResults(expected_results, results) {
107107
const expected = expected_results[k];
108108

109109
var msg = (expected[1] || '') +
110-
(' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
110+
(' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
111111

112112
if (expected && expected.length) {
113113
assert.equal(actual, expected[0], msg);

test/parallel/test-cluster-worker-kill.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function checkResults(expected_results, results) {
9090
const expected = expected_results[k];
9191

9292
var msg = (expected[1] || '') +
93-
(' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
93+
(' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
9494
if (expected && expected.length) {
9595
assert.equal(actual, expected[0], msg);
9696
} else {

test/parallel/test-domain-no-error-handler-abort-on-uncaught.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ if (process.argv[2] === 'child') {
182182

183183
child.on('exit', function onExit(exitCode, signal) {
184184
const errMsg = 'Test at index ' + testIndex + ' should have aborted ' +
185-
'but instead exited with exit code ' + exitCode + ' and signal ' +
186-
signal;
185+
'but instead exited with exit code ' + exitCode +
186+
' and signal ' + signal;
187187
assert(common.nodeProcessAborted(exitCode, signal), errMsg);
188188
});
189189
});

test/parallel/test-error-reporting.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var exits = 0;
88

99
function errExec(script, callback) {
1010
var cmd = '"' + process.argv[0] + '" "' +
11-
path.join(common.fixturesDir, script) + '"';
11+
path.join(common.fixturesDir, script) + '"';
1212
return exec(cmd, function(err, stdout, stderr) {
1313
// There was some error
1414
assert.ok(err);

test/parallel/test-fs-append-file-sync.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ var currentFileData = 'ABCD';
88

99
var num = 220;
1010
var data = '南越国是前203年至前111年存在于岭南地区的一个国家,国都位于番禺,疆域包括今天中国的广东、' +
11-
'广西两省区的大部份地区,福建省、湖南、贵州、云南的一小部份地区和越南的北部。' +
12-
'南越国是秦朝灭亡后,由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。' +
13-
'前196年和前179年,南越国曾先后两次名义上臣属于西汉,成为西汉的“外臣”。前112年,' +
14-
'南越国末代君主赵建德与西汉发生战争,被汉武帝于前111年所灭。南越国共存在93年,' +
15-
'历经五代君主。南越国是岭南地区的第一个有记载的政权国家,采用封建制和郡县制并存的制度,' +
16-
'它的建立保证了秦末乱世岭南地区社会秩序的稳定,有效的改善了岭南地区落后的政治、##济现状。\n';
11+
'广西两省区的大部份地区,福建省、湖南、贵州、云南的一小部份地区和越南的北部。' +
12+
'南越国是秦朝灭亡后,由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。' +
13+
'前196年和前179年,南越国曾先后两次名义上臣属于西汉,成为西汉的“外臣”。前112年,' +
14+
'南越国末代君主赵建德与西汉发生战争,被汉武帝于前111年所灭。南越国共存在93年,' +
15+
'历经五代君主。南越国是岭南地区的第一个有记载的政权国家,采用封建制和郡县制并存的制度,' +
16+
'它的建立保证了秦末乱世岭南地区社会秩序的稳定,有效的改善了岭南地区落后的政治、##济现状。\n';
1717

1818
common.refreshTmpDir();
1919

test/parallel/test-http-1.0.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ function test(handler, request_generator, response_validator) {
8888
}
8989

9090
function response_validator(server_response, client_got_eof, timed_out) {
91-
var expected_response = ('HTTP/1.1 200 OK\r\n' +
92-
'Content-Type: text/plain\r\n' +
93-
'Connection: close\r\n' +
94-
'\r\n' +
95-
'Hello, world!');
91+
var expected_response = 'HTTP/1.1 200 OK\r\n' +
92+
'Content-Type: text/plain\r\n' +
93+
'Connection: close\r\n' +
94+
'\r\n' +
95+
'Hello, world!';
9696

9797
assert.equal(expected_response, server_response);
9898
assert.equal(true, client_got_eof);
@@ -125,17 +125,17 @@ function test(handler, request_generator, response_validator) {
125125
}
126126

127127
function response_validator(server_response, client_got_eof, timed_out) {
128-
var expected_response = ('HTTP/1.1 200 OK\r\n' +
129-
'Content-Type: text/plain\r\n' +
130-
'Connection: close\r\n' +
131-
'Transfer-Encoding: chunked\r\n' +
132-
'\r\n' +
133-
'7\r\n' +
134-
'Hello, \r\n' +
135-
'6\r\n' +
136-
'world!\r\n' +
137-
'0\r\n' +
138-
'\r\n');
128+
var expected_response = 'HTTP/1.1 200 OK\r\n' +
129+
'Content-Type: text/plain\r\n' +
130+
'Connection: close\r\n' +
131+
'Transfer-Encoding: chunked\r\n' +
132+
'\r\n' +
133+
'7\r\n' +
134+
'Hello, \r\n' +
135+
'6\r\n' +
136+
'world!\r\n' +
137+
'0\r\n' +
138+
'\r\n';
139139

140140
assert.equal(expected_response, server_response);
141141
assert.equal(true, client_got_eof);

test/parallel/test-path.js

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ assert.equal(path.win32.dirname('\\\\unc\\share\\foo\\bar\\'),
7676
assert.equal(path.win32.dirname('\\\\unc\\share\\foo\\bar\\baz'),
7777
'\\\\unc\\share\\foo\\bar');
7878

79-
8079
assert.equal(path.extname(''), '');
8180
assert.equal(path.extname('/path/to/file'), '');
8281
assert.equal(path.extname('/path/to/file.ext'), '.ext');

test/parallel/test-readline-undefined-columns.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ oStream.on('data', function(data) {
2828

2929
oStream.on('end', function() {
3030
const expect = 'process.stdout\r\n' +
31-
'process.stdin\r\n' +
32-
'process.stderr';
31+
'process.stdin\r\n' +
32+
'process.stderr';
3333
assert(new RegExp(expect).test(output));
3434
});
3535

test/parallel/test-stdin-from-file.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var stdoutScript = join(common.fixturesDir, 'echo-close-check.js');
99
var tmpFile = join(common.tmpDir, 'stdin.txt');
1010

1111
var cmd = '"' + process.argv[0] + '" "' + stdoutScript + '" < "' +
12-
tmpFile + '"';
12+
tmpFile + '"';
1313

1414
var string = 'abc\nümlaut.\nsomething else\n' +
1515
'南越国是前203年至前111年存在于岭南地区的一个国家,国都位于番禺,' +

test/parallel/test-tls-cert-regression.js

+23-20
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,29 @@ if (!common.hasCrypto) {
99
var tls = require('tls');
1010

1111

12-
var cert = '-----BEGIN CERTIFICATE-----\n' +
13-
'MIIBfjCCASgCCQDmmNjAojbDQjANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB\n' +
14-
'VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0\n' +
15-
'cyBQdHkgTHRkMCAXDTE0MDExNjE3NTMxM1oYDzIyODcxMDMxMTc1MzEzWjBFMQsw\n' +
16-
'CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu\n' +
17-
'ZXQgV2lkZ2l0cyBQdHkgTHRkMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPKwlfMX\n' +
18-
'6HGZIt1xm7fna72eWcOYfUfSxSugghvqYgJt2Oi3lH+wsU1O9FzRIVmpeIjDXhbp\n' +
19-
'Mjsa1HtzSiccPXsCAwEAATANBgkqhkiG9w0BAQUFAANBAHOoKy0NkyfiYH7Ne5ka\n' +
20-
'uvCyndyeB4d24FlfqEUlkfaWCZlNKRaV9YhLDiEg3BcIreFo4brtKQfZzTRs0GVm\n' +
21-
'KHg=\n' +
22-
'-----END CERTIFICATE-----';
23-
var key = '-----BEGIN RSA PRIVATE KEY-----\n' +
24-
'MIIBPQIBAAJBAPKwlfMX6HGZIt1xm7fna72eWcOYfUfSxSugghvqYgJt2Oi3lH+w\n' +
25-
'sU1O9FzRIVmpeIjDXhbpMjsa1HtzSiccPXsCAwEAAQJBAM4uU9aJE0OfdE1p/X+K\n' +
26-
'LrCT3XMdFCJ24GgmHyOURtwDy18upQJecDVdcZp16fjtOPmaW95GoYRyifB3R4I5\n' +
27-
'RxECIQD7jRM9slCSVV8xp9kOJQNpHjhRQYVGBn+pyllS2sb+RQIhAPb7Y+BIccri\n' +
28-
'NWnuhwCW8hA7Fkj/kaBdAwyW7L3Tvui/AiEAiqLCovMecre4Yi6GcsQ1b/6mvSmm\n' +
29-
'IOS+AT6zIfXPTB0CIQCJKGR3ymN/Qw5crL1GQ41cHCQtF9ickOq/lBUW+j976wIh\n' +
30-
'AOaJnkQrmurlRdePX6LvN/LgGAQoxwovfjcOYNnZsIVY\n' +
31-
'-----END RSA PRIVATE KEY-----';
12+
var cert =
13+
`-----BEGIN CERTIFICATE-----
14+
MIIBfjCCASgCCQDmmNjAojbDQjANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB
15+
VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
16+
cyBQdHkgTHRkMCAXDTE0MDExNjE3NTMxM1oYDzIyODcxMDMxMTc1MzEzWjBFMQsw
17+
CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
18+
ZXQgV2lkZ2l0cyBQdHkgTHRkMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPKwlfMX
19+
6HGZIt1xm7fna72eWcOYfUfSxSugghvqYgJt2Oi3lH+wsU1O9FzRIVmpeIjDXhbp
20+
Mjsa1HtzSiccPXsCAwEAATANBgkqhkiG9w0BAQUFAANBAHOoKy0NkyfiYH7Ne5ka
21+
uvCyndyeB4d24FlfqEUlkfaWCZlNKRaV9YhLDiEg3BcIreFo4brtKQfZzTRs0GVm
22+
KHg=
23+
-----END CERTIFICATE-----`;
24+
25+
var key =
26+
`-----BEGIN RSA PRIVATE KEY-----
27+
MIIBPQIBAAJBAPKwlfMX6HGZIt1xm7fna72eWcOYfUfSxSugghvqYgJt2Oi3lH+w
28+
sU1O9FzRIVmpeIjDXhbpMjsa1HtzSiccPXsCAwEAAQJBAM4uU9aJE0OfdE1p/X+K
29+
LrCT3XMdFCJ24GgmHyOURtwDy18upQJecDVdcZp16fjtOPmaW95GoYRyifB3R4I5
30+
RxECIQD7jRM9slCSVV8xp9kOJQNpHjhRQYVGBn+pyllS2sb+RQIhAPb7Y+BIccri
31+
NWnuhwCW8hA7Fkj/kaBdAwyW7L3Tvui/AiEAiqLCovMecre4Yi6GcsQ1b/6mvSmm
32+
IOS+AT6zIfXPTB0CIQCJKGR3ymN/Qw5crL1GQ41cHCQtF9ickOq/lBUW+j976wIh
33+
AOaJnkQrmurlRdePX6LvN/LgGAQoxwovfjcOYNnZsIVY
34+
-----END RSA PRIVATE KEY-----`;
3235

3336
function test(cert, key, cb) {
3437
var server = tls.createServer({

test/parallel/test-tls-econnreset.js

+33-30
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,41 @@ if (!common.hasCrypto) {
88
}
99
var tls = require('tls');
1010

11-
var cacert = '-----BEGIN CERTIFICATE-----\n' +
12-
'MIIBxTCCAX8CAnXnMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAlVTMQswCQYD\n' +
13-
'VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQU3Ryb25n\n' +
14-
'TG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRowGAYDVQQDExFjYS5zdHJv\n' +
15-
'bmdsb29wLmNvbTAeFw0xNDAxMTcyMjE1MDdaFw00MTA2MDMyMjE1MDdaMH0xCzAJ\n' +
16-
'BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZ\n' +
17-
'MBcGA1UEChMQU3Ryb25nTG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRow\n' +
18-
'GAYDVQQDExFjYS5zdHJvbmdsb29wLmNvbTBMMA0GCSqGSIb3DQEBAQUAAzsAMDgC\n' +
19-
'MQDKbQ6rIR5t1q1v4Ha36jrq0IkyUohy9EYNvLnXUly1PGqxby0ILlAVJ8JawpY9\n' +
20-
'AVkCAwEAATANBgkqhkiG9w0BAQUFAAMxALA1uS4CqQXRSAyYTfio5oyLGz71a+NM\n' +
21-
'+0AFLBwh5AQjhGd0FcenU4OfHxyDEOJT/Q==\n' +
22-
'-----END CERTIFICATE-----\n';
11+
var cacert =
12+
`-----BEGIN CERTIFICATE-----
13+
MIIBxTCCAX8CAnXnMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAlVTMQswCQYD
14+
VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQU3Ryb25n
15+
TG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRowGAYDVQQDExFjYS5zdHJv
16+
bmdsb29wLmNvbTAeFw0xNDAxMTcyMjE1MDdaFw00MTA2MDMyMjE1MDdaMH0xCzAJ
17+
BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZ
18+
MBcGA1UEChMQU3Ryb25nTG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRow
19+
GAYDVQQDExFjYS5zdHJvbmdsb29wLmNvbTBMMA0GCSqGSIb3DQEBAQUAAzsAMDgC
20+
MQDKbQ6rIR5t1q1v4Ha36jrq0IkyUohy9EYNvLnXUly1PGqxby0ILlAVJ8JawpY9
21+
AVkCAwEAATANBgkqhkiG9w0BAQUFAAMxALA1uS4CqQXRSAyYTfio5oyLGz71a+NM
22+
+0AFLBwh5AQjhGd0FcenU4OfHxyDEOJT/Q==
23+
-----END CERTIFICATE-----`;
2324

24-
var cert = '-----BEGIN CERTIFICATE-----\n' +
25-
'MIIBfDCCATYCAgQaMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAlVTMQswCQYD\n' +
26-
'VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQU3Ryb25n\n' +
27-
'TG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRowGAYDVQQDExFjYS5zdHJv\n' +
28-
'bmdsb29wLmNvbTAeFw0xNDAxMTcyMjE1MDdaFw00MTA2MDMyMjE1MDdaMBkxFzAV\n' +
29-
'BgNVBAMTDnN0cm9uZ2xvb3AuY29tMEwwDQYJKoZIhvcNAQEBBQADOwAwOAIxAMfk\n' +
30-
'I0LWU15pPUwIQNMnRVhhOibi0TQmAau8FBtgwEfGK01WpfGUaJr1a41K8Uq7xwID\n' +
31-
'AQABoxkwFzAVBgNVHREEDjAMhwQAAAAAhwR/AAABMA0GCSqGSIb3DQEBBQUAAzEA\n' +
32-
'cGpYrhkrb7mIh9DNhV0qp7pGjqBzlHqB7KQXw2luLDp//6dyHBMexDCQznkhZKRU\n' +
33-
'-----END CERTIFICATE-----\n';
25+
var cert =
26+
`-----BEGIN CERTIFICATE-----
27+
MIIBfDCCATYCAgQaMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAlVTMQswCQYD
28+
VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQU3Ryb25n
29+
TG9vcCwgSW5jLjESMBAGA1UECxMJU3Ryb25nT3BzMRowGAYDVQQDExFjYS5zdHJv
30+
bmdsb29wLmNvbTAeFw0xNDAxMTcyMjE1MDdaFw00MTA2MDMyMjE1MDdaMBkxFzAV
31+
BgNVBAMTDnN0cm9uZ2xvb3AuY29tMEwwDQYJKoZIhvcNAQEBBQADOwAwOAIxAMfk
32+
I0LWU15pPUwIQNMnRVhhOibi0TQmAau8FBtgwEfGK01WpfGUaJr1a41K8Uq7xwID
33+
AQABoxkwFzAVBgNVHREEDjAMhwQAAAAAhwR/AAABMA0GCSqGSIb3DQEBBQUAAzEA
34+
cGpYrhkrb7mIh9DNhV0qp7pGjqBzlHqB7KQXw2luLDp//6dyHBMexDCQznkhZKRU
35+
-----END CERTIFICATE-----`;
3436

35-
var key = '-----BEGIN RSA PRIVATE KEY-----\n' +
36-
'MIH0AgEAAjEAx+QjQtZTXmk9TAhA0ydFWGE6JuLRNCYBq7wUG2DAR8YrTVal8ZRo\n' +
37-
'mvVrjUrxSrvHAgMBAAECMBCGccvSwC2r8Z9Zh1JtirQVxaL1WWpAQfmVwLe0bAgg\n' +
38-
'/JWMU/6hS36TsYyZMxwswQIZAPTAfht/zDLb7Hwgu2twsS1Ra9w/yyvtlwIZANET\n' +
39-
'26votwJAHK1yUrZGA5nnp5qcmQ/JUQIZAII5YV/UUZvF9D/fUplJ7puENPWNY9bN\n' +
40-
'pQIZAMMwxuS3XiO7two2sQF6W+JTYyX1DPCwAQIZAOYg1TvEGT38k8e8jygv8E8w\n' +
41-
'YqrWTeQFNQ==\n' +
42-
'-----END RSA PRIVATE KEY-----\n';
37+
var key =
38+
`-----BEGIN RSA PRIVATE KEY-----
39+
MIH0AgEAAjEAx+QjQtZTXmk9TAhA0ydFWGE6JuLRNCYBq7wUG2DAR8YrTVal8ZRo
40+
mvVrjUrxSrvHAgMBAAECMBCGccvSwC2r8Z9Zh1JtirQVxaL1WWpAQfmVwLe0bAgg
41+
/JWMU/6hS36TsYyZMxwswQIZAPTAfht/zDLb7Hwgu2twsS1Ra9w/yyvtlwIZANET
42+
26votwJAHK1yUrZGA5nnp5qcmQ/JUQIZAII5YV/UUZvF9D/fUplJ7puENPWNY9bN
43+
pQIZAMMwxuS3XiO7two2sQF6W+JTYyX1DPCwAQIZAOYg1TvEGT38k8e8jygv8E8w
44+
YqrWTeQFNQ==
45+
-----END RSA PRIVATE KEY-----`;
4346

4447
var ca = [ cert, cacert ];
4548

test/parallel/test-tls-parse-cert-string.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ require('../common');
44
const assert = require('assert');
55
const tls = require('tls');
66

7-
const singles = 'C=US\nST=CA\nL=SF\nO=Node.js Foundation\nOU=Node.js\nCN=ca1\n'
8-
+ 'emailAddress[email protected]';
7+
const singles = 'C=US\nST=CA\nL=SF\nO=Node.js Foundation\nOU=Node.js\n' +
8+
'CN=ca1\nemailAddress[email protected]';
99
const singlesOut = tls.parseCertString(singles);
1010
assert.deepEqual(singlesOut, {
1111
C: 'US',
@@ -18,7 +18,7 @@ assert.deepEqual(singlesOut, {
1818
});
1919

2020
const doubles = 'OU=Domain Control Validated\nOU=PositiveSSL Wildcard\n' +
21-
'CN=*.nodejs.org';
21+
'CN=*.nodejs.org';
2222
const doublesOut = tls.parseCertString(doubles);
2323
assert.deepEqual(doublesOut, {
2424
OU: [ 'Domain Control Validated', 'PositiveSSL Wildcard' ],

test/parallel/test-vm-static-this.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ assert.equal(2, global.hello);
2121

2222
console.error('pass values');
2323
var code = 'foo = 1;' +
24-
'bar = 2;' +
25-
'if (typeof baz !== \'undefined\') throw new Error(\'test fail\');';
24+
'bar = 2;' +
25+
'if (typeof baz !== \'undefined\') throw new Error(\'test fail\');';
2626
global.foo = 2;
2727
global.obj = { foo: 0, baz: 3 };
2828
/* eslint-disable no-unused-vars */

0 commit comments

Comments
 (0)