test: ensure assertions are reachable in test/addons

aduh95 · aduh95 · commit 29a5855a4ff5 · 2025-10-26T22:29:37.000+01:00
PR-URL: #60142 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/test/addons/async-resource/test.js b/test/addons/async-resource/test.js
@@ -17,7 +17,7 @@ let after = 0;
 let destroy = 0;
 
 async_hooks.createHook({
-  init(id, type, triggerAsyncId, resource) {
+  init: common.mustCall((id, type, triggerAsyncId, resource) => {
     assert.strictEqual(typeof id, 'number');
     assert.strictEqual(typeof resource, 'object');
     assert(id > 1);
@@ -26,7 +26,7 @@ async_hooks.createHook({
       assert.strictEqual(triggerAsyncId, expectedTriggerId);
       bindingUids.push(id);
     }
-  },
+  }, 7),
 
   before(id) {
     if (bindingUids.includes(id)) before++;
@@ -48,8 +48,11 @@ for (const call of [binding.callViaFunction,
     let uid;
     const object = {
       methöd(arg) {
+        // eslint-disable-next-line node-core/must-call-assert
         assert.strictEqual(this, object);
+        // eslint-disable-next-line node-core/must-call-assert
         assert.strictEqual(arg, 42);
+        // eslint-disable-next-line node-core/must-call-assert
         assert.strictEqual(async_hooks.executionAsyncId(), uid);
         return 'baz';
       },
diff --git a/test/addons/cppgc-object/test.js b/test/addons/cppgc-object/test.js
@@ -23,7 +23,7 @@ for (let i = 0; i < count; ++i) {
 
 globalThis.gc();
 
-setTimeout(async function() {
+setTimeout(common.mustCall(() => (async function() {
   // GC should have invoked Trace() on at least some of the CppGCed objects,
   // but they should all be alive at this point.
   assert.strictEqual(states[kDestructCount], 0);
@@ -48,4 +48,4 @@ setTimeout(async function() {
     'All old CppGCed are destroyed',
     () => states[kDestructCount] === count * 2,
   );
-}, 1);
+})().then(common.mustCall())), 1);
diff --git a/test/addons/make-callback-recurse/test.js b/test/addons/make-callback-recurse/test.js
@@ -71,11 +71,11 @@ assert.throws(() => {
     if (arg === 1) {
       // The tests are first run on bootstrap during LoadEnvironment() in
       // src/node.cc. Now run the tests through node::MakeCallback().
-      setImmediate(() => {
+      setImmediate(common.mustCall(() => {
         makeCallback({}, common.mustCall(() => {
           verifyExecutionOrder(2);
         }));
-      });
+      }));
     } else if (arg === 2) {
       // Make sure there are no conflicts using node::MakeCallback()
       // within timers.
diff --git a/test/addons/no-addons/permission.js b/test/addons/no-addons/permission.js
@@ -7,37 +7,11 @@ const assert = require('assert');
 
 const bindingPath = require.resolve(`./build/${common.buildType}/binding`);
 
-const assertError = (error) => {
-  assert(error instanceof Error);
-  assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');
-  assert.strictEqual(
-    error.message,
-    'Cannot load native addon because loading addons is disabled.',
-  );
-};
-
-{
-  let threw = false;
-
-  try {
-    require(bindingPath);
-  } catch (error) {
-    assertError(error);
-    threw = true;
-  }
-
-  assert(threw);
-}
-
-{
-  let threw = false;
-
-  try {
-    process.dlopen({ exports: {} }, bindingPath);
-  } catch (error) {
-    assertError(error);
-    threw = true;
-  }
-
-  assert(threw);
-}
+assert.throws(() => require(bindingPath), {
+  code: 'ERR_DLOPEN_DISABLED',
+  message: 'Cannot load native addon because loading addons is disabled.',
+});
+assert.throws(() => process.dlopen({ exports: {} }, bindingPath), {
+  code: 'ERR_DLOPEN_DISABLED',
+  message: 'Cannot load native addon because loading addons is disabled.',
+});
diff --git a/test/addons/no-addons/test-worker.js b/test/addons/no-addons/test-worker.js
@@ -9,21 +9,21 @@ const { Worker } = require('worker_threads');
 
 const binding = path.resolve(__dirname, `./build/${common.buildType}/binding`);
 
-const assertError = (error) => {
+const assertError = common.mustCall((error) => {
   assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');
   assert.strictEqual(
     error.message,
     'Cannot load native addon because loading addons is disabled.',
   );
-};
+}, 4);
 
 {
   // Flags should be inherited
   const worker = new Worker(`require(${JSON.stringify(binding)})`, {
     eval: true,
   });
 
-  worker.on('error', common.mustCall(assertError));
+  worker.on('error', assertError);
 }
 
 {
@@ -35,7 +35,7 @@ const assertError = (error) => {
     },
   );
 
-  worker.on('error', common.mustCall(assertError));
+  worker.on('error', assertError);
 }
 
 {
@@ -45,7 +45,7 @@ const assertError = (error) => {
     execArgv: ['--no-addons'],
   });
 
-  worker.on('error', common.mustCall(assertError));
+  worker.on('error', assertError);
 }
 
 {
@@ -55,5 +55,5 @@ const assertError = (error) => {
     execArgv: [],
   });
 
-  worker.on('error', common.mustCall(assertError));
+  worker.on('error', assertError);
 }
diff --git a/test/addons/no-addons/test.js b/test/addons/no-addons/test.js
@@ -7,37 +7,11 @@ const assert = require('assert');
 
 const bindingPath = require.resolve(`./build/${common.buildType}/binding`);
 
-const assertError = (error) => {
-  assert(error instanceof Error);
-  assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');
-  assert.strictEqual(
-    error.message,
-    'Cannot load native addon because loading addons is disabled.',
-  );
-};
-
-{
-  let threw = false;
-
-  try {
-    require(bindingPath);
-  } catch (error) {
-    assertError(error);
-    threw = true;
-  }
-
-  assert(threw);
-}
-
-{
-  let threw = false;
-
-  try {
-    process.dlopen({ exports: {} }, bindingPath);
-  } catch (error) {
-    assertError(error);
-    threw = true;
-  }
-
-  assert(threw);
-}
+assert.throws(() => require(bindingPath), {
+  code: 'ERR_DLOPEN_DISABLED',
+  message: 'Cannot load native addon because loading addons is disabled.',
+});
+assert.throws(() => process.dlopen({ exports: {} }, bindingPath), {
+  code: 'ERR_DLOPEN_DISABLED',
+  message: 'Cannot load native addon because loading addons is disabled.',
+});
diff --git a/test/addons/null-buffer-neuter/test.js b/test/addons/null-buffer-neuter/test.js
@@ -6,6 +6,6 @@ const binding = require(`./build/${common.buildType}/binding`);
 
 binding.run();
 global.gc();
-setImmediate(() => {
+setImmediate(common.mustCall(() => {
   assert.strictEqual(binding.isAlive(), 0);
-});
+}));
diff --git a/test/addons/symlinked-module/submodule.js b/test/addons/symlinked-module/submodule.js
@@ -1,13 +1,13 @@
 'use strict';
-require('../../common');
+const common = require('../../common');
 const path = require('path');
 const assert = require('assert');
 
 // This is a subtest of symlinked-module/test.js. This is not
 // intended to be run directly.
 
-module.exports.test = function test(bindingDir) {
+module.exports.test = common.mustCall(function test(bindingDir) {
   const mod = require(path.join(bindingDir, 'binding.node'));
   assert.notStrictEqual(mod, null);
   assert.strictEqual(mod.hello(), 'world');
-};
+}, require.main === module ? 0 : 2);
diff --git a/test/eslint.config_partial.mjs b/test/eslint.config_partial.mjs
@@ -156,7 +156,21 @@ export default [
   },
   {
     files: [
-      'test/{async-hooks,benchmark,cctest,client-proxy,message,module-hooks,node-api,pummel,pseudo-tty,v8-updates,wasi}/**/*.{js,mjs,cjs}',
+      `test/{${[
+        'abort',
+        'addons',
+        'async-hooks',
+        'benchmark',
+        'cctest',
+        'client-proxy',
+        'message',
+        'module-hooks',
+        'node-api',
+        'pummel',
+        'pseudo-tty',
+        'v8-updates',
+        'wasi',
+      ].join(',')}}/**/*.{js,mjs,cjs}`,
     ],
     rules: {
       'node-core/must-call-assert': 'error',

Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,21 @@ const { Worker } = require('worker_threads');`
`9`	`9`
`10`	`10`	const binding = path.resolve(__dirname, `./build/${common.buildType}/binding`);
`11`	`11`
`12`		`-const assertError = (error) => {`
	`12`	`+const assertError = common.mustCall((error) => {`
`13`	`13`	`assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');`
`14`	`14`	`assert.strictEqual(`
`15`	`15`	`error.message,`
`16`	`16`	`'Cannot load native addon because loading addons is disabled.',`
`17`	`17`	`);`
`18`		`-};`
	`18`	`+}, 4);`
`19`	`19`
`20`	`20`	`{`
`21`	`21`	`// Flags should be inherited`
`22`	`22`	const worker = new Worker(`require(${JSON.stringify(binding)})`, {
`23`	`23`	`eval: true,`
`24`	`24`	`});`
`25`	`25`
`26`		`- worker.on('error', common.mustCall(assertError));`
	`26`	`+ worker.on('error', assertError);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`{`
`@@ -35,7 +35,7 @@ const assertError = (error) => {`
`35`	`35`	`},`
`36`	`36`	`);`
`37`	`37`
`38`		`- worker.on('error', common.mustCall(assertError));`
	`38`	`+ worker.on('error', assertError);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`{`
`@@ -45,7 +45,7 @@ const assertError = (error) => {`
`45`	`45`	`execArgv: ['--no-addons'],`
`46`	`46`	`});`
`47`	`47`
`48`		`- worker.on('error', common.mustCall(assertError));`
	`48`	`+ worker.on('error', assertError);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`{`
`@@ -55,5 +55,5 @@ const assertError = (error) => {`
`55`	`55`	`execArgv: [],`
`56`	`56`	`});`
`57`	`57`
`58`		`- worker.on('error', common.mustCall(assertError));`
	`58`	`+ worker.on('error', assertError);`
`59`	`59`	`}`