From a277001292d39b8519227470e43357f9c580f583 Mon Sep 17 00:00:00 2001 From: Alethea Rose Date: Wed, 15 Feb 2017 21:34:13 -0500 Subject: [PATCH 09/23] Remove -no_rand_screen from s_client invocation --- test/parallel/test-https-foafssl.js | 4 ---- test/parallel/test-tls-alert.js | 4 ---- test/parallel/test-tls-dhe.js | 4 ---- test/parallel/test-tls-ecdh-disable.js | 4 ---- test/parallel/test-tls-ecdh.js | 4 ---- test/parallel/test-tls-no-sslv3.js | 4 ---- test/parallel/test-tls-securepair-server.js | 4 ---- test/parallel/test-tls-server-verify.js | 4 ---- test/parallel/test-tls-session-cache.js | 4 ---- test/parallel/test-tls-set-ciphers.js | 4 ---- 10 files changed, 40 deletions(-) diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index 2a22bda6..4e1a8fbc 100644 --- a/test/parallel/test-https-foafssl.js +++ b/test/parallel/test-https-foafssl.js @@ -72,10 +72,6 @@ server.listen(0, function() { '-cert', fixtures.path('foafssl.crt'), '-key', fixtures.path('foafssl.key')]; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); client.stdout.on('data', function(data) { diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js index 8e78e748..5847f9ce 100644 --- a/test/parallel/test-tls-alert.js +++ b/test/parallel/test-tls-alert.js @@ -46,10 +46,6 @@ const server = tls.Server({ const args = ['s_client', '-quiet', '-tls1_1', '-connect', `127.0.0.1:${this.address().port}`]; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); let out = ''; client.stderr.setEncoding('utf8'); diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js index 177f6f2e..86868633 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -71,10 +71,6 @@ function test(keylen, expectedCipher, cb) { const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`, '-cipher', ciphers]; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); let out = ''; client.stdout.setEncoding('utf8'); diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js index 72b51771..ef761147 100644 --- a/test/parallel/test-tls-ecdh-disable.js +++ b/test/parallel/test-tls-ecdh-disable.js @@ -48,10 +48,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { let cmd = `"${common.opensslCli}" s_client -cipher ${ options.ciphers} -connect 127.0.0.1:${this.address().port}`; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - cmd += ' -no_rand_screen'; - exec(cmd, common.mustCall(function(err, stdout, stderr) { // Old versions of openssl will still exit with 0 so we // can't just check if err is not null. diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js index 170031b2..9cd58006 100644 --- a/test/parallel/test-tls-ecdh.js +++ b/test/parallel/test-tls-ecdh.js @@ -51,10 +51,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { let cmd = `"${common.opensslCli}" s_client -cipher ${ options.ciphers} -connect 127.0.0.1:${this.address().port}`; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - cmd += ' -no_rand_screen'; - exec(cmd, common.mustCall(function(err, stdout, stderr) { assert.ifError(err); assert(stdout.includes(reply)); diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js index 92f85128..4cbb62e3 100644 --- a/test/parallel/test-tls-no-sslv3.js +++ b/test/parallel/test-tls-no-sslv3.js @@ -23,10 +23,6 @@ server.listen(0, '127.0.0.1', function() { '-ssl3', '-connect', address]; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args, { stdio: 'pipe' }); client.stdout.pipe(process.stdout); client.stderr.pipe(process.stderr); diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js index 056eebda..994e037c 100644 --- a/test/parallel/test-tls-securepair-server.js +++ b/test/parallel/test-tls-securepair-server.js @@ -113,10 +113,6 @@ server.listen(0, common.mustCall(function() { const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`]; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js index 92c4752a..f2edfd36 100644 --- a/test/parallel/test-tls-server-verify.js +++ b/test/parallel/test-tls-server-verify.js @@ -149,10 +149,6 @@ function runClient(prefix, port, options, cb) { const args = ['s_client', '-connect', `127.0.0.1:${port}`]; - // for the performance issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - console.log(`${prefix} connecting with`, options.name); switch (options.name) { diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js index 2bbf3b64..6bd57bb2 100644 --- a/test/parallel/test-tls-session-cache.js +++ b/test/parallel/test-tls-session-cache.js @@ -105,10 +105,6 @@ function doTest(testOptions, callback) { '-reconnect' ].concat(testOptions.tickets ? [] : '-no_ticket'); - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - args.push('-no_rand_screen'); - function spawnClient() { const client = spawn(common.opensslCli, args, { stdio: [ 0, 1, 'pipe' ] diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js index abb5f219..04bfb832 100644 --- a/test/parallel/test-tls-set-ciphers.js +++ b/test/parallel/test-tls-set-ciphers.js @@ -54,10 +54,6 @@ server.listen(0, '127.0.0.1', function() { let cmd = `"${common.opensslCli}" s_client -cipher ${ options.ciphers} -connect 127.0.0.1:${this.address().port}`; - // for the performance and stability issue in s_client on Windows - if (common.isWindows) - cmd += ' -no_rand_screen'; - exec(cmd, function(err, stdout, stderr) { assert.ifError(err); response = stdout; -- 2.17.0.windows.1