tls: Updated TLS-PSK tests to not use common.PORT when possible. Ad…

…ded some `mustCall` wrappers in TLS-PSK circuit test.
taylorzane · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017
commit 65cb3515ee7d9f3dd6730421b4f96a960a78f567
diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
@@ -42,20 +42,22 @@ const server = tls.createServer(serverOptions, common.mustCall((c) => {
     c.end(data);
   });
 }, 3));
-server.listen(common.PORT, startTest);
+server.listen(0, function() {
+  startTest(this.address().port);
+});
 
-function startTest() {
+function startTest(port) {
   function connectClient(options, next) {
-    const client = tls.connect(common.PORT, 'localhost', options, () => {
+    const client = tls.connect(port, 'localhost', options, () => {
       clientResults.push('connect');
 
       client.end(TEST_DATA);
 
-      client.on('data', (data) => {
+      client.on('data', common.mustCallAtLeast((data) => {
         assert.strictEqual(data.toString(), TEST_DATA);
-      });
+      }));
 
-      client.on('close', next);
+      client.on('close', common.mustCall(next));
     });
 
     let errored = false;

diff --git a/test/parallel/test-tls-psk-server.js b/test/parallel/test-tls-psk-server.js
@@ -40,10 +40,10 @@ let sentWorld = false;
 let gotWorld = false;
 let opensslExitCode = -1;
 
-server.listen(common.PORT, () => {
+server.listen(0, function() {
   const client = spawn(common.opensslCli, [
     's_client',
-    '-connect', '127.0.0.1:' + common.PORT,
+    '-connect', '127.0.0.1:' + this.address().port,
     '-cipher', CIPHERS,
     '-psk', KEY,
     '-psk_identity', IDENTITY