Commit 2458501
test: refactor test-tls-ecdh-disable
* use common.mustCall()
* use String.prototype.includes() instead of String.prototype.indexOf()
PR-URL: #9989
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 980b4db commit 2458501
1 file changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -20,18 +20,18 @@ var options = { | |||
| 20 | 20 | ||
| 21 | 21 | var server = tls.createServer(options, common.fail); | |
| 22 | 22 | ||
| 23 | - server.listen(0, '127.0.0.1', function() { | ||
| 23 | + server.listen(0, '127.0.0.1', common.mustCall(function() { | ||
| 24 | 24 | var cmd = '"' + common.opensslCli + '" s_client -cipher ' + options.ciphers + | |
| 25 | 25 | ` -connect 127.0.0.1:${this.address().port}`; | |
| 26 | 26 | ||
| 27 | 27 | // for the performance and stability issue in s_client on Windows | |
| 28 | 28 | if (common.isWindows) | |
| 29 | 29 | cmd += ' -no_rand_screen'; | |
| 30 | 30 | ||
| 31 | - exec(cmd, function(err, stdout, stderr) { | ||
| 31 | + exec(cmd, common.mustCall(function(err, stdout, stderr) { | ||
| 32 | 32 | // Old versions of openssl will still exit with 0 so we | |
| 33 | 33 | // can't just check if err is not null. | |
| 34 | - assert.notEqual(stderr.indexOf('handshake failure'), -1); | ||
| 34 | + assert(stderr.includes('handshake failure')); | ||
| 35 | 35 | server.close(); | |
| 36 | - }); | ||
| 37 | - }); | ||
| 36 | + })); | ||
| 37 | + })); | ||
0 commit comments