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>
This commit is contained in:
Shigeki Ohtsu 2017-03-02 23:19:49 +09:00
parent 02c98f480c
commit 1824bbbff1
2 changed files with 6 additions and 6 deletions

View File

@ -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');

View File

@ -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;
}