Skip to content

Commit c5c65c8

Browse files
vsemozhetbytMylesBorins
vsemozhetbyt
authored and
MylesBorins
committed
test: fix require nits in some test-tls-* tests
* Do not require if test is skipped. * Do not re-require without need. * Sort requiring by module names. PR-URL: #14008 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent f3c0b8c commit c5c65c8

11 files changed

+50
-39
lines changed

Diff for: ‎test/internet/test-tls-add-ca-cert.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ if (!common.hasCrypto) {
1010

1111
const assert = require('assert');
1212
const fs = require('fs');
13+
const path = require('path');
1314
const tls = require('tls');
1415

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

1920
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-alert-handling.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ if (!common.hasCrypto) {
1111
return;
1212
}
1313

14-
const tls = require('tls');
15-
const net = require('net');
1614
const fs = require('fs');
15+
const net = require('net');
16+
const path = require('path');
17+
const tls = require('tls');
1718

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

2223
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-alert.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22
const common = require('../common');
3-
const assert = require('assert');
43

54
if (!common.opensslCli) {
65
common.skip('node compiled without OpenSSL CLI.');
@@ -11,15 +10,17 @@ if (!common.hasCrypto) {
1110
common.skip('missing crypto');
1211
return;
1312
}
14-
const tls = require('tls');
1513

14+
const assert = require('assert');
15+
const { spawn } = require('child_process');
1616
const fs = require('fs');
17-
const spawn = require('child_process').spawn;
17+
const path = require('path');
18+
const tls = require('tls');
1819

1920
let success = false;
2021

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

2526
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-alpn-server-client.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ if (!process.features.tls_alpn || !process.features.tls_npn) {
1414

1515
const assert = require('assert');
1616
const fs = require('fs');
17+
const path = require('path');
1718
const tls = require('tls');
1819

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

2324
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-client-verify.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
'use strict';
22
const common = require('../common');
3-
const assert = require('assert');
43

54
if (!common.hasCrypto) {
65
common.skip('missing crypto');
76
return;
87
}
9-
const tls = require('tls');
108

9+
const assert = require('assert');
1110
const fs = require('fs');
11+
const path = require('path');
12+
const tls = require('tls');
1213

1314
const hosterr = /Hostname\/IP doesn't match certificate's altnames/;
1415
const testCases =
@@ -44,7 +45,7 @@ const testCases =
4445
];
4546

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

5051

Diff for: ‎test/parallel/test-tls-cnnic-whitelist.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ if (!common.hasCrypto) {
88
}
99

1010
const assert = require('assert');
11-
const tls = require('tls');
1211
const fs = require('fs');
1312
const path = require('path');
13+
const tls = require('tls');
1414

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

Diff for: ‎test/parallel/test-tls-npn-server-client.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ if (!process.features.tls_npn) {
55
}
66

77
const common = require('../common');
8-
const assert = require('assert');
9-
const fs = require('fs');
108

119
if (!common.hasCrypto) {
1210
common.skip('missing crypto');
1311
return;
1412
}
15-
const tls = require('tls');
1613

14+
const assert = require('assert');
15+
const fs = require('fs');
16+
const path = require('path');
17+
const tls = require('tls');
1718

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

2223
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-server-verify.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if (!common.opensslCli) {
66
return;
77
}
88

9+
if (!common.hasCrypto) {
10+
common.skip('missing crypto');
11+
return;
12+
}
13+
914
// This is a rather complex test which sets up various TLS servers with node
1015
// and connects to them using the 'openssl s_client' command line utility
1116
// with various keys. Depending on the certificate authority and other
@@ -14,6 +19,14 @@ if (!common.opensslCli) {
1419
// - accepted and "unauthorized", or
1520
// - accepted and "authorized".
1621

22+
const assert = require('assert');
23+
const { spawn } = require('child_process');
24+
const { SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION } =
25+
require('crypto').constants;
26+
const fs = require('fs');
27+
const path = require('path');
28+
const tls = require('tls');
29+
1730
const testCases =
1831
[{ title: 'Do not request certs. Everyone is unauthorized.',
1932
requestCert: false,
@@ -98,22 +111,9 @@ const testCases =
98111
}
99112
];
100113

101-
if (!common.hasCrypto) {
102-
common.skip('missing crypto');
103-
return;
104-
}
105-
const tls = require('tls');
106-
107-
const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION =
108-
require('crypto').constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
109-
110-
const assert = require('assert');
111-
const fs = require('fs');
112-
const spawn = require('child_process').spawn;
113-
114114

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

119119

Diff for: ‎test/parallel/test-tls-sni-option.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ if (!process.features.tls_sni) {
55
}
66

77
const common = require('../common');
8-
const assert = require('assert');
9-
const fs = require('fs');
108

119
if (!common.hasCrypto) {
1210
common.skip('missing crypto');
1311
return;
1412
}
13+
14+
const assert = require('assert');
15+
const fs = require('fs');
16+
const path = require('path');
1517
const tls = require('tls');
1618

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

2123
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-sni-server-client.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ if (!process.features.tls_sni) {
55
}
66

77
const common = require('../common');
8-
const assert = require('assert');
9-
const fs = require('fs');
108

119
if (!common.hasCrypto) {
1210
common.skip('missing crypto');
1311
return;
1412
}
13+
14+
const assert = require('assert');
15+
const fs = require('fs');
16+
const path = require('path');
1517
const tls = require('tls');
1618

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

2123
function loadPEM(n) {

Diff for: ‎test/parallel/test-tls-startcom-wosign-whitelist.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
'use strict';
22
const common = require('../common');
3-
const assert = require('assert');
43

54
if (!common.hasCrypto) {
65
common.skip('missing crypto');
76
return;
87
}
98

10-
const tls = require('tls');
9+
const assert = require('assert');
1110
const fs = require('fs');
1211
const path = require('path');
12+
const tls = require('tls');
13+
1314
let finished = 0;
1415

1516
function filenamePEM(n) {

0 commit comments

Comments
 (0)