test: remove unnecessary logic around requireFlags() calls

common.requireFlags() does some checking before relaunching. Some of those checks are duplicated in the tests calling common.requireFlags(). Remove instances of duplicate logic.
nodejs · Trott · Dec 19, 2018 · Dec 19, 2018 · Dec 19, 2018 · Dec 19, 2018
commit d4eb09d39fc36901573b509739c46f79e219de36
diff --git a/test/addons/buffer-free-callback/test.js b/test/addons/buffer-free-callback/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const binding = require(`./build/${common.buildType}/binding`);
 
 function check(size, alignment, offset) {

diff --git a/test/addons/null-buffer-neuter/test.js b/test/addons/null-buffer-neuter/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const binding = require(`./build/${common.buildType}/binding`);
 
 binding.run();
diff --git a/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js b/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js
@@ -4,8 +4,8 @@ const common = require('../../common');
 const skipMessage = 'intensive toString tests due to memory confinements';
 if (!common.enoughTestMem)
   common.skip(skipMessage);
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+
+common.requireFlags(['--expose-gc']);
 
 const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');

diff --git a/test/async-hooks/test-no-assert-when-disabled.js b/test/async-hooks/test-no-assert-when-disabled.js
@@ -4,11 +4,7 @@ const common = require('../common');
 if (!common.isMainThread)
   common.skip('Workers don\'t inherit per-env state like the check flag');
 
-if (!require('module').builtinModules.includes('internal/async_hooks')) {
-  common.requireFlags(
-    ['--expose-internals', '--no-force-async-hooks-checks']
-  );
-}
+common.requireFlags(['--expose-internals', '--no-force-async-hooks-checks']);
 
 const async_hooks = require('internal/async_hooks');
 

diff --git a/test/async-hooks/test-pipewrap.js b/test/async-hooks/test-pipewrap.js
@@ -5,8 +5,7 @@
 const common = require('../common');
 if (!common.isMainThread)
   common.skip('Worker bootstrapping works differently -> different async IDs');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const tick = require('../common/tick');
 const initHooks = require('./init-hooks');

diff --git a/test/async-hooks/test-querywrap.js b/test/async-hooks/test-querywrap.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const tick = require('../common/tick');
 const initHooks = require('./init-hooks');

diff --git a/test/common/index.js b/test/common/index.js
@@ -686,14 +686,13 @@ function requireFlags(flags) {
   if (!(flags instanceof Array)) {
     flags = [flags];
   }
-  const missing = flags.filter((flag) => !process.execArgv.includes(flag));
+  let missing = flags.filter((flag) => !process.execArgv.includes(flag));
 
   // Special handling for worker_threads. Can be removed once worker_threads
   // are no longer behind a flag.
-  if (missing.some((flag) => /--experimental[-_]worker/.test(flag))) {
-    if (require('module').builtinModules.includes('worker_threads')) {
-      return;
-    }
+  if (missing.length === 1 &&
+      require('module').builtinModules.includes('worker_threads')) {
+    missing = missing.filter((flag) => !/--experimental[-_]worker/.test(flag));
   }
 
   if (missing.length > 0) {

diff --git a/test/js-native-api/7_factory_wrap/test.js b/test/js-native-api/7_factory_wrap/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const test = require(`./build/${common.buildType}/binding`);
 

diff --git a/test/js-native-api/8_passing_wrapped/test.js b/test/js-native-api/8_passing_wrapped/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const addon = require(`./build/${common.buildType}/binding`);
 

diff --git a/test/js-native-api/test_exception/test.js b/test/js-native-api/test_exception/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const theError = new Error('Some error');
 

diff --git a/test/js-native-api/test_function/test.js b/test/js-native-api/test_function/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 
 // testing api calls for function

diff --git a/test/js-native-api/test_general/test.js b/test/js-native-api/test_general/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const test_general = require(`./build/${common.buildType}/test_general`);
 const assert = require('assert');
 

diff --git a/test/js-native-api/test_general/testFinalizer.js b/test/js-native-api/test_general/testFinalizer.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const test_general = require(`./build/${common.buildType}/test_general`);
 const assert = require('assert');
 

diff --git a/test/js-native-api/test_reference/test.js b/test/js-native-api/test_reference/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 
 const test_reference = require(`./build/${common.buildType}/test_reference`);

diff --git a/test/known_issues/test-inspector-cluster-port-clash.js b/test/known_issues/test-inspector-cluster-port-clash.js
@@ -1,7 +1,6 @@
 'use strict';
 const common = require('../common');
-if (!process.execArgv.includes('--inspect=0'))
-  common.requireFlags(['--inspect=0']);
+common.requireFlags(['--inspect=0']);
 
 // With the current behavior of Node.js (at least as late as 8.1.0), this
 // test fails with the following error:

diff --git a/test/message/unhandled_promise_trace_warnings.js b/test/message/unhandled_promise_trace_warnings.js
@@ -1,7 +1,6 @@
 'use strict';
 const common = require('../common');
-if (!process.execArgv.includes('--trace-warnings'))
-  common.requireFlags(['--trace-warnings']);
+common.requireFlags(['--trace-warnings']);
 common.disableCrashOnUnhandledRejection();
 const p = Promise.reject(new Error('This was rejected'));
 setImmediate(() => p.catch(() => {}));
diff --git a/test/node-api/test_buffer/test.js b/test/node-api/test_buffer/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const binding = require(`./build/${common.buildType}/test_buffer`);
 const assert = require('assert');
 

diff --git a/test/node-api/test_exception/test.js b/test/node-api/test_exception/test.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const test_exception = require(`./build/${common.buildType}/test_exception`);
 

diff --git a/test/parallel/test-async-hooks-destroy-on-gc.js b/test/parallel/test-async-hooks-destroy-on-gc.js
@@ -4,8 +4,7 @@
 // be emitted when they get gced.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const async_hooks = require('async_hooks');
 

diff --git a/test/parallel/test-async-hooks-disable-gc-tracking.js b/test/parallel/test-async-hooks-disable-gc-tracking.js
@@ -4,8 +4,7 @@
 // be emitted when they get gced.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const async_hooks = require('async_hooks');
 
 const hook = async_hooks.createHook({

diff --git a/test/parallel/test-async-hooks-prevent-double-destroy.js b/test/parallel/test-async-hooks-prevent-double-destroy.js
@@ -4,8 +4,7 @@
 // be emitted when they get gced.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const async_hooks = require('async_hooks');
 
 const hook = async_hooks.createHook({

diff --git a/test/parallel/test-buffer-nopendingdep.js b/test/parallel/test-buffer-nopendingdep.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../common');
-if (!process.execArgv.includes('--pending-deprecation'))
-  common.requireFlags(['--pending-deprecation']);
+common.requireFlags(['--pending-deprecation']);
 
 process.on('warning', common.mustNotCall('A warning should not be emitted'));
 

diff --git a/test/parallel/test-buffer-zero-fill-cli.js b/test/parallel/test-buffer-zero-fill-cli.js
@@ -5,9 +5,7 @@
 
 const common = require('../common');
 
-if (!process.execArgv.includes('--zero-fill-buffers')) {
-  common.requireFlags(['--zero-fill-buffers']);
-}
+common.requireFlags(['--zero-fill-buffers']);
 
 const SlowBuffer = require('buffer').SlowBuffer;
 const assert = require('assert');

diff --git a/test/parallel/test-common-gc.js b/test/parallel/test-common-gc.js
@@ -1,7 +1,6 @@
 'use strict';
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const onGC = require('../common/ongc');
 
 {

diff --git a/test/parallel/test-crypto-dh-leak.js b/test/parallel/test-crypto-dh-leak.js
@@ -3,8 +3,7 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-if (!global.gc)
-  common.requireFlags(['--expose-gc', '--noconcurrent-recompilation']);
+common.requireFlags(['--expose-gc', '--noconcurrent-recompilation']);
 
 const assert = require('assert');
 const crypto = require('crypto');

diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
@@ -25,8 +25,7 @@ const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
-if (!process.execArgv.includes('--pending-deprecation'))
-  common.requireFlags(['--pending-deprecation']);
+common.requireFlags(['--pending-deprecation']);
 
 const assert = require('assert');
 const crypto = require('crypto');

diff --git a/test/parallel/test-debug-args.js b/test/parallel/test-debug-args.js
@@ -9,5 +9,4 @@ const common = require('../common');
 if (!common.isMainThread)
   common.skip('execArgv does not affect Workers');
 
-if (!process.execArgv.includes('--debug-code'))
-  common.requireFlags(['--debug-code']);
+common.requireFlags(['--debug-code']);
diff --git a/test/parallel/test-err-name-deprecation.js b/test/parallel/test-err-name-deprecation.js
@@ -1,8 +1,7 @@
 'use strict';
 const common = require('../common');
 
-if (!process.execArgv.includes('--pending-deprecation'))
-  common.requireFlags(['--pending-deprecation']);
+common.requireFlags(['--pending-deprecation']);
 
 common.expectWarning(
   'DeprecationWarning',

diff --git a/test/parallel/test-fs-filehandle.js b/test/parallel/test-fs-filehandle.js
@@ -1,11 +1,7 @@
 'use strict';
 
 const common = require('../common');
-if (!global.gc) {
-  common.requireFlags(
-    ['--expose-gc', '--expose-internals', '--no-warnings']
-  );
-}
+common.requireFlags(['--expose-gc', '--expose-internals', '--no-warnings']);
 
 const assert = require('assert');
 const path = require('path');

diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js
@@ -21,8 +21,7 @@
 
 'use strict';
 const common = require('../common');
-if (!process.execArgv.includes('--expose-externalize-string'))
-  common.requireFlags(['--expose-externalize-string']);
+common.requireFlags(['--expose-externalize-string']);
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');

diff --git a/test/parallel/test-gc-http-client-connaborted.js b/test/parallel/test-gc-http-client-connaborted.js
@@ -3,8 +3,7 @@
 // but aborting every connection that comes in.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const onGC = require('../common/ongc');
 
 const http = require('http');

diff --git a/test/parallel/test-gc-http-client-onerror.js b/test/parallel/test-gc-http-client-onerror.js
@@ -3,8 +3,7 @@
 // but with an on('error') handler that does nothing.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const onGC = require('../common/ongc');
 
 const cpus = require('os').cpus().length;

diff --git a/test/parallel/test-gc-http-client-timeout.js b/test/parallel/test-gc-http-client-timeout.js
@@ -3,8 +3,7 @@
 // but with a timeout set
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const onGC = require('../common/ongc');
 
 function serverHandler(req, res) {

diff --git a/test/parallel/test-gc-net-timeout.js b/test/parallel/test-gc-net-timeout.js
@@ -3,8 +3,7 @@
 // but using a net server/client instead
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const onGC = require('../common/ongc');
 
 function serverHandler(sock) {

diff --git a/test/parallel/test-gc-tls-external-memory.js b/test/parallel/test-gc-tls-external-memory.js
@@ -6,8 +6,7 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 
 const makeDuplexPair = require('../common/duplexpair');
 const onGC = require('../common/ongc');

diff --git a/test/parallel/test-http-parser-bad-ref.js b/test/parallel/test-http-parser-bad-ref.js
@@ -3,8 +3,7 @@
 // problem.
 
 const common = require('../common');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const { HTTPParser } = require('_http_common');
 

diff --git a/test/parallel/test-http-same-map.js b/test/parallel/test-http-same-map.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const common = require('../common');
-if (!process.execArgv.includes('--allow-natives-syntax'))
-  common.requireFlags(['--allow-natives-syntax']);
+common.requireFlags(['--allow-natives-syntax']);
 const assert = require('assert');
 const http = require('http');
 

diff --git a/test/parallel/test-http2-createwritereq.js b/test/parallel/test-http2-createwritereq.js
@@ -3,8 +3,7 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-if (!global.gc)
-  common.requireFlags(['--expose-gc']);
+common.requireFlags(['--expose-gc']);
 const assert = require('assert');
 const http2 = require('http2');