From 912ac36be31c4b055e99c3734d299d725ea695fe Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 3 Apr 2018 10:35:45 +0200 Subject: [PATCH] test: set clientOpts.port property Currently this test will overwrite the clientOpts object with the port, instead of setting the port property on the clientOpts object which looks like the original intent. Doing this the test fails reporting that the fake-cnnic-root-cert has expired. This is indeed true: $ openssl x509 -in test/fixtures/keys/fake-cnnic-root-cert.pem \ -text -noout Certificate: ... Validity Not Before: Jun 9 17:15:16 2015 GMT Not After : Mar 29 17:15:16 2018 GMT This commit sets the errorCode to CERT_HAS_EXPIRED. I tried updating the certificate using test/fixtures/keys/Makefile but then no error is thrown and I'm currently looking into this. Backport-PR-URL: https://github.com/nodejs/node/pull/20776 PR-URL: https://github.com/nodejs/node/pull/19767 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Luigi Pinca --- test/parallel/test-tls-cnnic-whitelist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-cnnic-whitelist.js b/test/parallel/test-tls-cnnic-whitelist.js index 80f188f36670a1..c95d6cc9528ff3 100644 --- a/test/parallel/test-tls-cnnic-whitelist.js +++ b/test/parallel/test-tls-cnnic-whitelist.js @@ -28,7 +28,7 @@ const testCases = [ rejectUnauthorized: true, ca: [loadPEM('fake-cnnic-root-cert')] }, - errorCode: 'UNABLE_TO_VERIFY_LEAF_SIGNATURE' + errorCode: 'CERT_HAS_EXPIRED' }, // Test 1: for the fix of node#2061 // agent6-cert.pem is signed by intermediate cert of ca3. @@ -58,7 +58,7 @@ function runTest(tindex) { const server = tls.createServer(tcase.serverOpts, (s) => { s.resume(); }).listen(0, common.mustCall(function() { - tcase.clientOpts = this.address().port; + tcase.clientOpts.port = this.address().port; const client = tls.connect(tcase.clientOpts); client.on('error', common.mustCall((e) => { assert.strictEqual(e.code, tcase.errorCode);