nodejs
diff --git a/Collapse file
‎test/sequential/test-tls-securepair-client.js‎
Copy file name to clipboardExpand all lines: test/sequential/test-tls-securepair-client.js
+7-6Lines changed: 7 additions & 6 deletions b/Collapse file
‎test/sequential/test-tls-securepair-client.js‎
Copy file name to clipboardExpand all lines: test/sequential/test-tls-securepair-client.js
+7-6Lines changed: 7 additions & 6 deletions
@@ -62,7 +62,7 @@ function test(keyPath, certPath, check, next) {
   const cert = fixtures.readSync(certPath).toString();
 
   const server = spawn(common.opensslCli, ['s_server',
-                                           '-accept', common.PORT,
+                                           '-accept', 0,
                                            '-cert', fixtures.path(certPath),
                                            '-key', fixtures.path(keyPath)]);
   server.stdout.pipe(process.stdout);
@@ -78,10 +78,11 @@ function test(keyPath, certPath, check, next) {
     console.log(state);
     switch (state) {
       case 'WAIT-ACCEPT':
-        if (/ACCEPT/.test(serverStdoutBuffer)) {
-          // Give s_server half a second to start up.
-          setTimeout(startClient, 500);
+        const matches = serverStdoutBuffer.match(/ACCEPT .*?:(\d+)/);
+        if (matches) {
+          const port = matches[1];
           state = 'WAIT-HELLO';
+          startClient(port);
         }
         break;
 
@@ -117,7 +118,7 @@ function test(keyPath, certPath, check, next) {
   });
 
 
-  function startClient() {
+  function startClient(port) {
     const s = new net.Stream();
 
     const sslcontext = tls.createSecureContext({ key, cert });
@@ -131,7 +132,7 @@ function test(keyPath, certPath, check, next) {
     pair.encrypted.pipe(s);
     s.pipe(pair.encrypted);
 
-    s.connect(common.PORT);
+    s.connect(port);
 
     s.on('connect', function() {
       console.log('client connected');