diff options
author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2017-03-02 17:19:49 +0300 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2017-03-06 01:25:05 +0300 |
commit | 8377374754e0be64250146c5d24107642b0449c3 (patch) | |
tree | bd8e06b145301ea25101ce8c8b413e9ec7ff5643 /test | |
parent | d6ac192fa32e88d599a202043e279c04a66d4280 (diff) |
test: fix tests when npn feature is disabled.
ALPN test needs NPN feature to run. It also change the messages when
ALPN and NPN tests are skipped.
Fixes: https://github.com/nodejs/node/issues/11650
PR-URL: https://github.com/nodejs/node/pull/11655
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-tls-alpn-server-client.js | 8 | ||||
-rw-r--r-- | test/parallel/test-tls-npn-server-client.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js index ca5785b09ac..9199d946791 100644 --- a/test/parallel/test-tls-alpn-server-client.js +++ b/test/parallel/test-tls-alpn-server-client.js @@ -6,10 +6,10 @@ if (!common.hasCrypto) { return; } -if (!process.features.tls_alpn) { - console.error('Skipping because node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); - process.exit(0); +if (!process.features.tls_alpn || !process.features.tls_npn) { + common.skip('Skipping because node compiled without NPN or ALPN' + + ' feature of OpenSSL.'); + return; } const assert = require('assert'); diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js index 3c69204d680..c12fddb55bf 100644 --- a/test/parallel/test-tls-npn-server-client.js +++ b/test/parallel/test-tls-npn-server-client.js @@ -1,8 +1,8 @@ 'use strict'; const common = require('../common'); if (!process.features.tls_npn) { - common.skip('node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); + common.skip('Skipping because node compiled without NPN feature of' + + ' OpenSSL.'); return; } |