test: deflake test-tls-passphrase

Move `socket.end()` to client. Fixes: nodejs#28111 Refs: nodejs#27569 PR-URL: nodejs#29134 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nxtedition · Aug 19, 2019 · a0cc62f · a0cc62f
1 parent 8d100c2
commit a0cc62f
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js
@@ -37,15 +37,17 @@ assert(Buffer.isBuffer(cert));
 assert.strictEqual(typeof passKey.toString(), 'string');
 assert.strictEqual(typeof cert.toString(), 'string');
 
+function onSecureConnect() {
+  return common.mustCall(function() { this.end(); });
+}
+
 const server = tls.Server({
   key: passKey,
   passphrase: 'password',
   cert: cert,
   ca: [cert],
   requestCert: true,
   rejectUnauthorized: true
-}, function(s) {
-  s.end();
 });
 
 server.listen(0, common.mustCall(function() {
@@ -56,22 +58,22 @@ server.listen(0, common.mustCall(function() {
     passphrase: 'password',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: rawKey,
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: rawKey,
     passphrase: 'ignored',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   // Buffer[]
   tls.connect({
@@ -80,22 +82,22 @@ server.listen(0, common.mustCall(function() {
     passphrase: 'password',
     cert: [cert],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [rawKey],
     cert: [cert],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [rawKey],
     passphrase: 'ignored',
     cert: [cert],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   // string
   tls.connect({
@@ -104,22 +106,22 @@ server.listen(0, common.mustCall(function() {
     passphrase: 'password',
     cert: cert.toString(),
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: rawKey.toString(),
     cert: cert.toString(),
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: rawKey.toString(),
     passphrase: 'ignored',
     cert: cert.toString(),
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   // String[]
   tls.connect({
@@ -128,97 +130,97 @@ server.listen(0, common.mustCall(function() {
     passphrase: 'password',
     cert: [cert.toString()],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [rawKey.toString()],
     cert: [cert.toString()],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [rawKey.toString()],
     passphrase: 'ignored',
     cert: [cert.toString()],
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   // Object[]
   tls.connect({
     port: this.address().port,
     key: [{ pem: passKey, passphrase: 'password' }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: passKey, passphrase: 'password' }],
     passphrase: 'ignored',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: passKey }],
     passphrase: 'password',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: passKey.toString(), passphrase: 'password' }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey, passphrase: 'ignored' }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey.toString(), passphrase: 'ignored' }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey }],
     passphrase: 'ignored',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey.toString() }],
     passphrase: 'ignored',
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 
   tls.connect({
     port: this.address().port,
     key: [{ pem: rawKey.toString() }],
     cert: cert,
     rejectUnauthorized: false
-  }, common.mustCall());
+  }, onSecureConnect());
 })).unref();
 
 const errMessagePassword = /bad decrypt/;