Skip to content

Commit 0cc12fc

Browse files
vsemozhetbytaddaleax
vsemozhetbyt
authored and
addaleax
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 <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent b9e07f9 commit 0cc12fc

11 files changed

+50
-42
lines changed

‎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) {

‎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) {

‎test/parallel/test-tls-alert.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
'use strict';
2323
const common = require('../common');
24-
const assert = require('assert');
2524

2625
if (!common.opensslCli) {
2726
common.skip('node compiled without OpenSSL CLI.');
@@ -32,15 +31,17 @@ if (!common.hasCrypto) {
3231
common.skip('missing crypto');
3332
return;
3433
}
35-
const tls = require('tls');
3634

35+
const assert = require('assert');
36+
const { spawn } = require('child_process');
3737
const fs = require('fs');
38-
const spawn = require('child_process').spawn;
38+
const path = require('path');
39+
const tls = require('tls');
3940

4041
let success = false;
4142

4243
function filenamePEM(n) {
43-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
44+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
4445
}
4546

4647
function loadPEM(n) {

‎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) {

‎test/parallel/test-tls-client-verify.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121

2222
'use strict';
2323
const common = require('../common');
24-
const assert = require('assert');
2524

2625
if (!common.hasCrypto) {
2726
common.skip('missing crypto');
2827
return;
2928
}
30-
const tls = require('tls');
3129

30+
const assert = require('assert');
3231
const fs = require('fs');
32+
const path = require('path');
33+
const tls = require('tls');
3334

3435
const hosterr = /Hostname\/IP doesn't match certificate's altnames/;
3536
const testCases =
@@ -65,7 +66,7 @@ const testCases =
6566
];
6667

6768
function filenamePEM(n) {
68-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
69+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
6970
}
7071

7172

‎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`);

‎test/parallel/test-tls-npn-server-client.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ if (!process.features.tls_npn) {
2626
return;
2727
}
2828

29-
const assert = require('assert');
30-
const fs = require('fs');
31-
3229
if (!common.hasCrypto) {
3330
common.skip('missing crypto');
3431
return;
3532
}
36-
const tls = require('tls');
3733

34+
const assert = require('assert');
35+
const fs = require('fs');
36+
const path = require('path');
37+
const tls = require('tls');
3838

3939
function filenamePEM(n) {
40-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
40+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
4141
}
4242

4343
function loadPEM(n) {

‎test/parallel/test-tls-server-verify.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ if (!common.opensslCli) {
2727
return;
2828
}
2929

30+
if (!common.hasCrypto) {
31+
common.skip('missing crypto');
32+
return;
33+
}
34+
3035
// This is a rather complex test which sets up various TLS servers with node
3136
// and connects to them using the 'openssl s_client' command line utility
3237
// with various keys. Depending on the certificate authority and other
@@ -35,6 +40,14 @@ if (!common.opensslCli) {
3540
// - accepted and "unauthorized", or
3641
// - accepted and "authorized".
3742

43+
const assert = require('assert');
44+
const { spawn } = require('child_process');
45+
const { SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION } =
46+
require('crypto').constants;
47+
const fs = require('fs');
48+
const path = require('path');
49+
const tls = require('tls');
50+
3851
const testCases =
3952
[{ title: 'Do not request certs. Everyone is unauthorized.',
4053
requestCert: false,
@@ -119,22 +132,9 @@ const testCases =
119132
}
120133
];
121134

122-
if (!common.hasCrypto) {
123-
common.skip('missing crypto');
124-
return;
125-
}
126-
const tls = require('tls');
127-
128-
const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION =
129-
require('crypto').constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
130-
131-
const assert = require('assert');
132-
const fs = require('fs');
133-
const spawn = require('child_process').spawn;
134-
135135

136136
function filenamePEM(n) {
137-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
137+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
138138
}
139139

140140

‎test/parallel/test-tls-sni-option.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@ if (!process.features.tls_sni) {
2626
return;
2727
}
2828

29-
const assert = require('assert');
30-
const fs = require('fs');
31-
3229
if (!common.hasCrypto) {
3330
common.skip('missing crypto');
3431
return;
3532
}
33+
34+
const assert = require('assert');
35+
const fs = require('fs');
36+
const path = require('path');
3637
const tls = require('tls');
3738

3839
function filenamePEM(n) {
39-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
40+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
4041
}
4142

4243
function loadPEM(n) {

‎test/parallel/test-tls-sni-server-client.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@ if (!process.features.tls_sni) {
2626
return;
2727
}
2828

29-
const assert = require('assert');
30-
const fs = require('fs');
31-
3229
if (!common.hasCrypto) {
3330
common.skip('missing crypto');
3431
return;
3532
}
33+
34+
const assert = require('assert');
35+
const fs = require('fs');
36+
const path = require('path');
3637
const tls = require('tls');
3738

3839
function filenamePEM(n) {
39-
return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
40+
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
4041
}
4142

4243
function loadPEM(n) {

‎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)