diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index 2a22bda60e7..4e1a8fbc4c6 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 8e78e748525..5847f9ce9ad 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 9fbd8d980c2..86130aff262 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -72,10 +72,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-auto.js b/test/parallel/test-tls-ecdh-auto.js index eaa7e1da6de..21aecad6cdc 100644 --- a/test/parallel/test-tls-ecdh-auto.js +++ b/test/parallel/test-tls-ecdh-auto.js @@ -39,10 +39,6 @@ server.listen(0, function() { '-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) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); client.stdout.on('data', function(data) { diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js index 1109b71dbe2..f06063200c5 100644 --- a/test/parallel/test-tls-ecdh-disable.js +++ b/test/parallel/test-tls-ecdh-disable.js @@ -54,13 +54,9 @@ common.expectWarning('DeprecationWarning', const server = tls.createServer(options, common.mustNotCall()); server.listen(0, '127.0.0.1', common.mustCall(function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ + const 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-multiple.js b/test/parallel/test-tls-ecdh-multiple.js index dee75f97216..5dea61e20fb 100644 --- a/test/parallel/test-tls-ecdh-multiple.js +++ b/test/parallel/test-tls-ecdh-multiple.js @@ -39,10 +39,6 @@ server.listen(0, function() { '-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) - args.push('-no_rand_screen'); - const client = spawn(common.opensslCli, args); client.stdout.on('data', function(data) { diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js index 170031b2f79..e7d986cc9ae 100644 --- a/test/parallel/test-tls-ecdh.js +++ b/test/parallel/test-tls-ecdh.js @@ -48,13 +48,9 @@ const server = tls.createServer(options, common.mustCall(function(conn) { })); server.listen(0, '127.0.0.1', common.mustCall(function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ + const 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 92f85128625..4cbb62e3d59 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 056eebda0e6..994e037c05a 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 b8291af8d69..6039d13e821 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 7778dd03100..55dd92e81d2 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 abb5f21909c..ef2c2543517 100644 --- a/test/parallel/test-tls-set-ciphers.js +++ b/test/parallel/test-tls-set-ciphers.js @@ -51,13 +51,9 @@ const server = tls.createServer(options, common.mustCall(function(conn) { })); server.listen(0, '127.0.0.1', function() { - let cmd = `"${common.opensslCli}" s_client -cipher ${ + const 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;