summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVse Mozhet Byt <vsemozhetbyt@gmail.com>2017-06-30 20:52:53 +0300
committerVse Mozhet Byt <vsemozhetbyt@gmail.com>2017-07-04 04:04:49 +0300
commitcc1a47dc6b94b2feb4de9e46be9333d81d537783 (patch)
treec1d09cecb958b653999040212137cf52cf03f960
parentf1c890afb05274880df0f1ce4084607c03b194bf (diff)
downloadandroid-node-v8-cc1a47dc6b94b2feb4de9e46be9333d81d537783.tar.gz
android-node-v8-cc1a47dc6b94b2feb4de9e46be9333d81d537783.tar.bz2
android-node-v8-cc1a47dc6b94b2feb4de9e46be9333d81d537783.zip
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: https://github.com/nodejs/node/pull/14008 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-rw-r--r--test/internet/test-tls-add-ca-cert.js3
-rw-r--r--test/parallel/test-tls-alert-handling.js7
-rw-r--r--test/parallel/test-tls-alert.js9
-rw-r--r--test/parallel/test-tls-alpn-server-client.js3
-rw-r--r--test/parallel/test-tls-client-verify.js7
-rw-r--r--test/parallel/test-tls-cnnic-whitelist.js2
-rw-r--r--test/parallel/test-tls-npn-server-client.js10
-rw-r--r--test/parallel/test-tls-server-verify.js28
-rw-r--r--test/parallel/test-tls-sni-option.js9
-rw-r--r--test/parallel/test-tls-sni-server-client.js9
-rw-r--r--test/parallel/test-tls-startcom-wosign-whitelist.js5
11 files changed, 50 insertions, 42 deletions
diff --git a/test/internet/test-tls-add-ca-cert.js b/test/internet/test-tls-add-ca-cert.js
index 457dfdac7f..1283230e91 100644
--- a/test/internet/test-tls-add-ca-cert.js
+++ b/test/internet/test-tls-add-ca-cert.js
@@ -10,10 +10,11 @@ if (!common.hasCrypto) {
const assert = require('assert');
const fs = require('fs');
+const path = require('path');
const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-alert-handling.js b/test/parallel/test-tls-alert-handling.js
index 5268f520f1..d089ad223b 100644
--- a/test/parallel/test-tls-alert-handling.js
+++ b/test/parallel/test-tls-alert-handling.js
@@ -11,12 +11,13 @@ if (!common.hasCrypto) {
return;
}
-const tls = require('tls');
-const net = require('net');
const fs = require('fs');
+const net = require('net');
+const path = require('path');
+const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js
index d12d45f529..ef79856108 100644
--- a/test/parallel/test-tls-alert.js
+++ b/test/parallel/test-tls-alert.js
@@ -21,7 +21,6 @@
'use strict';
const common = require('../common');
-const assert = require('assert');
if (!common.opensslCli) {
common.skip('node compiled without OpenSSL CLI.');
@@ -32,15 +31,17 @@ if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
-const tls = require('tls');
+const assert = require('assert');
+const { spawn } = require('child_process');
const fs = require('fs');
-const spawn = require('child_process').spawn;
+const path = require('path');
+const tls = require('tls');
let success = false;
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js
index a397550d96..3d3453d32f 100644
--- a/test/parallel/test-tls-alpn-server-client.js
+++ b/test/parallel/test-tls-alpn-server-client.js
@@ -14,10 +14,11 @@ if (!process.features.tls_alpn || !process.features.tls_npn) {
const assert = require('assert');
const fs = require('fs');
+const path = require('path');
const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-client-verify.js b/test/parallel/test-tls-client-verify.js
index 93fa99f773..d713be3b0c 100644
--- a/test/parallel/test-tls-client-verify.js
+++ b/test/parallel/test-tls-client-verify.js
@@ -21,15 +21,16 @@
'use strict';
const common = require('../common');
-const assert = require('assert');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
-const tls = require('tls');
+const assert = require('assert');
const fs = require('fs');
+const path = require('path');
+const tls = require('tls');
const hosterr = /Hostname\/IP doesn't match certificate's altnames/;
const testCases =
@@ -65,7 +66,7 @@ const testCases =
];
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
diff --git a/test/parallel/test-tls-cnnic-whitelist.js b/test/parallel/test-tls-cnnic-whitelist.js
index a33e631ddf..0845317486 100644
--- a/test/parallel/test-tls-cnnic-whitelist.js
+++ b/test/parallel/test-tls-cnnic-whitelist.js
@@ -8,9 +8,9 @@ if (!common.hasCrypto) {
}
const assert = require('assert');
-const tls = require('tls');
const fs = require('fs');
const path = require('path');
+const tls = require('tls');
function filenamePEM(n) {
return path.join(common.fixturesDir, 'keys', `${n}.pem`);
diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js
index ac617072f3..ffaf61b633 100644
--- a/test/parallel/test-tls-npn-server-client.js
+++ b/test/parallel/test-tls-npn-server-client.js
@@ -26,18 +26,18 @@ if (!process.features.tls_npn) {
return;
}
-const assert = require('assert');
-const fs = require('fs');
-
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
-const tls = require('tls');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js
index 65ddaa5e2d..86a735f64c 100644
--- a/test/parallel/test-tls-server-verify.js
+++ b/test/parallel/test-tls-server-verify.js
@@ -27,6 +27,11 @@ if (!common.opensslCli) {
return;
}
+if (!common.hasCrypto) {
+ common.skip('missing crypto');
+ return;
+}
+
// This is a rather complex test which sets up various TLS servers with node
// and connects to them using the 'openssl s_client' command line utility
// with various keys. Depending on the certificate authority and other
@@ -35,6 +40,14 @@ if (!common.opensslCli) {
// - accepted and "unauthorized", or
// - accepted and "authorized".
+const assert = require('assert');
+const { spawn } = require('child_process');
+const { SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION } =
+ require('crypto').constants;
+const fs = require('fs');
+const path = require('path');
+const tls = require('tls');
+
const testCases =
[{ title: 'Do not request certs. Everyone is unauthorized.',
requestCert: false,
@@ -119,22 +132,9 @@ const testCases =
}
];
-if (!common.hasCrypto) {
- common.skip('missing crypto');
- return;
-}
-const tls = require('tls');
-
-const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION =
- require('crypto').constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
-
-const assert = require('assert');
-const fs = require('fs');
-const spawn = require('child_process').spawn;
-
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
diff --git a/test/parallel/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js
index 52fb90ec93..ad7410b163 100644
--- a/test/parallel/test-tls-sni-option.js
+++ b/test/parallel/test-tls-sni-option.js
@@ -26,17 +26,18 @@ if (!process.features.tls_sni) {
return;
}
-const assert = require('assert');
-const fs = require('fs');
-
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js
index 0ee382ad38..300010cfa1 100644
--- a/test/parallel/test-tls-sni-server-client.js
+++ b/test/parallel/test-tls-sni-server-client.js
@@ -26,17 +26,18 @@ if (!process.features.tls_sni) {
return;
}
-const assert = require('assert');
-const fs = require('fs');
-
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
const tls = require('tls');
function filenamePEM(n) {
- return require('path').join(common.fixturesDir, 'keys', `${n}.pem`);
+ return path.join(common.fixturesDir, 'keys', `${n}.pem`);
}
function loadPEM(n) {
diff --git a/test/parallel/test-tls-startcom-wosign-whitelist.js b/test/parallel/test-tls-startcom-wosign-whitelist.js
index 21dbb55c15..601c0e4393 100644
--- a/test/parallel/test-tls-startcom-wosign-whitelist.js
+++ b/test/parallel/test-tls-startcom-wosign-whitelist.js
@@ -1,15 +1,16 @@
'use strict';
const common = require('../common');
-const assert = require('assert');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
-const tls = require('tls');
+const assert = require('assert');
const fs = require('fs');
const path = require('path');
+const tls = require('tls');
+
let finished = 0;
function filenamePEM(n) {