From 143e3d462749427d4f7649ae539686f33765a189 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 23 Dec 2017 09:00:43 +0100 Subject: [PATCH 1/2] test: refactor test-tls-securepair-fiftharg Assert the server name directly in the `SNICallback`, since `common.mustCall()` already guarantees that the callback is called exactly once, making `process.on('exit')` unnecessary. --- test/parallel/test-tls-securepair-fiftharg.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/parallel/test-tls-securepair-fiftharg.js b/test/parallel/test-tls-securepair-fiftharg.js index 364b70aa76b0ca..0d75e6138de059 100644 --- a/test/parallel/test-tls-securepair-fiftharg.js +++ b/test/parallel/test-tls-securepair-fiftharg.js @@ -13,10 +13,9 @@ const sslcontext = tls.createSecureContext({ key: fixtures.readSync('test_key.pem') }); -let catchedServername; const pair = tls.createSecurePair(sslcontext, true, false, false, { - SNICallback: common.mustCall(function(servername, cb) { - catchedServername = servername; + SNICallback: common.mustCall((servername, cb) => { + assert.strictEqual('www.google.com', servername); }) }); @@ -24,7 +23,3 @@ const pair = tls.createSecurePair(sslcontext, true, false, false, { const sslHello = fixtures.readSync('google_ssl_hello.bin'); pair.encrypted.write(sslHello); - -process.on('exit', function() { - assert.strictEqual('www.google.com', catchedServername); -}); From 5a04c1d559518d488cb5ab38540a02f8a892023b Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 24 Dec 2017 07:59:26 +0100 Subject: [PATCH 2/2] [squash] swap assert arguments --- test/parallel/test-tls-securepair-fiftharg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-tls-securepair-fiftharg.js b/test/parallel/test-tls-securepair-fiftharg.js index 0d75e6138de059..185dc43d941ca6 100644 --- a/test/parallel/test-tls-securepair-fiftharg.js +++ b/test/parallel/test-tls-securepair-fiftharg.js @@ -15,7 +15,7 @@ const sslcontext = tls.createSecureContext({ const pair = tls.createSecurePair(sslcontext, true, false, false, { SNICallback: common.mustCall((servername, cb) => { - assert.strictEqual('www.google.com', servername); + assert.strictEqual(servername, 'www.google.com'); }) });