Commit 5335b0a
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 0f8a323 commit 5335b0a
1 file changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,18 +29,18 @@ var server = tls.createServer(options, function(conn) { | |||
| 29 | 29 | nconns++; | |
| 30 | 30 | }); | |
| 31 | 31 | ||
| 32 | - server.listen(0, '127.0.0.1', function() { | ||
| 32 | + server.listen(0, '127.0.0.1', common.mustCall(function() { | ||
| 33 | 33 | var cmd = '"' + common.opensslCli + '" s_client -cipher ' + options.ciphers + | |
| 34 | 34 | ` -connect 127.0.0.1:${this.address().port}`; | |
| 35 | 35 | ||
| 36 | 36 | // for the performance and stability issue in s_client on Windows | |
| 37 | 37 | if (common.isWindows) | |
| 38 | 38 | cmd += ' -no_rand_screen'; | |
| 39 | 39 | ||
| 40 | - exec(cmd, function(err, stdout, stderr) { | ||
| 40 | + exec(cmd, common.mustCall(function(err, stdout, stderr) { | ||
| 41 | 41 | // Old versions of openssl will still exit with 0 so we | |
| 42 | 42 | // can't just check if err is not null. | |
| 43 | - assert.notEqual(stderr.indexOf('handshake failure'), -1); | ||
| 43 | + assert(stderr.includes('handshake failure')); | ||
| 44 | 44 | server.close(); | |
| 45 | - }); | ||
| 46 | - }); | ||
| 45 | + })); | ||
| 46 | + })); | ||
0 commit comments