test: use fipsMode instead of common.hasFipsCrypto

Currently, test-cli-node-print-help uses common.hasFipsCrypto to determine if the test should check for the existence of FIPS related options (--enable-fips, and --force-fips). The FIPS options are available when node has been compiled against an OpenSSL library with FIPS support in which case the test would verify that these options are available. But by using crypto.fips (which uses crypto.getFips()) this would only be checked when fips has been enabled, but these options are available regardless if FIPS is enabled or disabled. This commit updates the test to use fipsMode from config to determine if the FIPS options existence should be checked. PR-URL: #25510 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · May 16, 2019 · d5316e0a1bf944044dbc7637e59f26ed56fd12a1 · d5316e0
1 parent 48482b0
commit d5316e0a1bf944044dbc7637e59f26ed56fd12a1
Showing with 4 additions and 2 deletions.

+4 −2 test/parallel/test-cli-node-print-help.js
diff --git a/test/parallel/test-cli-node-print-help.js b/test/parallel/test-cli-node-print-help.js
@@ -1,3 +1,4 @@
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');
@@ -7,6 +8,8 @@ const common = require('../common');
 
 const assert = require('assert');
 const { exec } = require('child_process');
+const { internalBinding } = require('internal/test/binding');
+const { fipsMode } = internalBinding('config');
 let stdOut;
 
 
@@ -21,15 +24,14 @@ function startPrintHelpTest() {
 function validateNodePrintHelp() {
   const config = process.config;
   const HAVE_OPENSSL = common.hasCrypto;
-  const NODE_FIPS_MODE = common.hasFipsCrypto;
   const NODE_HAVE_I18N_SUPPORT = common.hasIntl;
   const HAVE_INSPECTOR = config.variables.v8_enable_inspector === 1;
 
   const cliHelpOptions = [
     { compileConstant: HAVE_OPENSSL,
       flags: [ '--openssl-config=...', '--tls-cipher-list=...',
                '--use-bundled-ca', '--use-openssl-ca' ] },
-    { compileConstant: NODE_FIPS_MODE,
+    { compileConstant: fipsMode,
       flags: [ '--enable-fips', '--force-fips' ] },
     { compileConstant: NODE_HAVE_I18N_SUPPORT,
       flags: [ '--icu-data-dir=...', 'NODE_ICU_DATA' ] },