test: split test-cli-node-options

* partitioning the subprocess groups * use `-e` instead of module * reduce maxBuffer PR-URL: #14195 Fixes: #14191 Reviewed-By: Rich Trott <[email protected]>
nodejs · Sep 11, 2017 · df1f462 · df1f462
1 parent b25156e
commit df1f462
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 45 deletions.
diff --git a/test/parallel/test-cli-node-options-disallowed.js b/test/parallel/test-cli-node-options-disallowed.js
@@ -0,0 +1,40 @@
+'use strict';
+const common = require('../common');
+if (process.config.variables.node_without_node_options)
+  common.skip('missing NODE_OPTIONS support');
+
+// Test options specified by env variable.
+
+const assert = require('assert');
+const exec = require('child_process').execFile;
+
+common.refreshTmpDir();
+process.chdir(common.tmpDir);
+
+disallow('--version');
+disallow('-v');
+disallow('--help');
+disallow('-h');
+disallow('--eval');
+disallow('-e');
+disallow('--print');
+disallow('-p');
+disallow('-pe');
+disallow('--check');
+disallow('-c');
+disallow('--interactive');
+disallow('-i');
+disallow('--v8-options');
+disallow('--');
+disallow('--no_warnings'); // Node options don't allow '_' instead of '-'.
+
+function disallow(opt) {
+  const env = Object.assign({}, process.env, { NODE_OPTIONS: opt });
+  exec(process.execPath, { env }, common.mustCall(function(err) {
+    const message = err.message.split(/\r?\n/)[1];
+    const expect = `${process.execPath}: ${opt} is not allowed in NODE_OPTIONS`;
+
+    assert.strictEqual(err.code, 9);
+    assert.strictEqual(message, expect);
+  }));
+}
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
@@ -11,38 +11,7 @@ const exec = require('child_process').execFile;
 common.refreshTmpDir();
 process.chdir(common.tmpDir);
 
-disallow('--version');
-disallow('-v');
-disallow('--help');
-disallow('-h');
-disallow('--eval');
-disallow('-e');
-disallow('--print');
-disallow('-p');
-disallow('-pe');
-disallow('--check');
-disallow('-c');
-disallow('--interactive');
-disallow('-i');
-disallow('--v8-options');
-disallow('--');
-disallow('--no_warnings'); // Node options don't allow '_' instead of '-'.
-
-function disallow(opt) {
-  const options = { env: Object.assign({}, process.env,
-                                       { NODE_OPTIONS: opt }) };
-  exec(process.execPath, options, common.mustCall(function(err) {
-    const message = err.message.split(/\r?\n/)[1];
-    const expect = `${process.execPath}: ${opt} is not allowed in NODE_OPTIONS`;
-
-    assert.strictEqual(err.code, 9);
-    assert.strictEqual(message, expect);
-  }));
-}
-
-const printA = require.resolve('../fixtures/printA.js');
-
-expect(`-r ${printA}`, 'A\nB\n');
+expect(`-r ${require.resolve('../fixtures/printA.js')}`, 'A\nB\n');
 expect('--no-deprecation', 'B\n');
 expect('--no-warnings', 'B\n');
 expect('--trace-warnings', 'B\n');
@@ -54,33 +23,28 @@ expect('--track-heap-objects', 'B\n');
 expect('--throw-deprecation', 'B\n');
 expect('--zero-fill-buffers', 'B\n');
 expect('--v8-pool-size=10', 'B\n');
+
 if (common.hasCrypto) {
   expect('--use-openssl-ca', 'B\n');
   expect('--use-bundled-ca', 'B\n');
   expect('--openssl-config=_ossl_cfg', 'B\n');
 }
 
 // V8 options
-expect('--abort-on-uncaught-exception', 'B\n');
-expect('--abort_on_uncaught_exception', 'B\n');
 expect('--abort_on-uncaught_exception', 'B\n');
-expect('--max_old_space_size=0', 'B\n');
-expect('--max-old_space-size=0', 'B\n');
 expect('--max-old-space-size=0', 'B\n');
 
 function expect(opt, want) {
-  const printB = require.resolve('../fixtures/printB.js');
-  const argv = [printB];
+  const argv = ['-e', 'console.log("B")'];
   const opts = {
     env: Object.assign({}, process.env, { NODE_OPTIONS: opt }),
-    maxBuffer: 1000000000,
+    maxBuffer: 1e6,
   };
-  exec(process.execPath, argv, opts, common.mustCall(function(err, stdout) {
+  exec(process.execPath, argv, opts, common.mustCall((err, stdout) => {
     assert.ifError(err);
-    if (!RegExp(want).test(stdout)) {
-      console.error('For %j, failed to find %j in: <\n%s\n>',
-                    opt, want, stdout);
-      assert.fail(`Expected ${want}`);
-    }
+    if (stdout.includes(want)) return;
+
+    const o = JSON.stringify(opt);
+    assert.fail(`For ${o}, failed to find ${want} in: <\n${stdout}\n>`);
   }));
 }