test: run test suites with helpers

PR-URL: #976 Reviewed-By: Michael Dawson <[email protected]>
nodejs · Apr 23, 2021 · b6f5eb1 · b6f5eb1
1 parent fbcdf00
commit b6f5eb1
Show file tree

Hide file tree

Showing 67 changed files with 191 additions and 260 deletions.
diff --git a/test/addon.js b/test/addon.js
@@ -1,9 +1,8 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 
-test(require(`./build/${buildType}/binding.node`));
-test(require(`./build/${buildType}/binding_noexcept.node`));
+module.exports = require('./common').runTest(test);
 
 function test(binding) {
   assert.strictEqual(binding.addon.increment(), 43);

diff --git a/test/addon_data.js b/test/addon_data.js
@@ -1,15 +1,10 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 const { spawn } = require('child_process');
 const readline = require('readline');
-const path = require('path');
 
-module.exports =
-  test(path.resolve(__dirname, `./build/${buildType}/binding.node`))
-  .then(() =>
-    test(path.resolve(__dirname,
-                      `./build/${buildType}/binding_noexcept.node`)));
+module.exports = require('./common').runTestWithBindingPath(test);
 
 // Make sure the instance data finalizer is called at process exit. If the hint
 // is non-zero, it will be printed out by the child process.

diff --git a/test/arraybuffer.js b/test/arraybuffer.js
@@ -1,10 +1,9 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 const testUtil = require('./testUtil');
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = require('./common').runTest(test);
 
 function test(binding) {
   return testUtil.runGCTests([

diff --git a/test/asynccontext.js b/test/asynccontext.js
@@ -1,5 +1,5 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 const common = require('./common');
 
@@ -17,14 +17,27 @@ function checkAsyncHooks() {
   return false;
 }
 
-test(require(`./build/${buildType}/binding.node`));
-test(require(`./build/${buildType}/binding_noexcept.node`));
+module.exports = common.runTest(test);
 
 function installAsyncHooksForTest() {
   return new Promise((resolve, reject) => {
     let id;
     const events = [];
-    const hook = async_hooks.createHook({
+    /**
+     * TODO(legendecas): investigate why resolving & disabling hooks in
+     * destroy callback causing crash with case 'callbackscope.js'.
+     */
+    let hook;
+    let destroyed = false;
+    const interval = setInterval(() => {
+      if (destroyed) {
+        hook.disable();
+        clearInterval(interval);
+        resolve(events);
+      }
+    }, 10);
+
+    hook = async_hooks.createHook({
       init(asyncId, type, triggerAsyncId, resource) {
         if (id === undefined && type === 'async_context_test') {
           id = asyncId;
@@ -44,30 +57,30 @@ function installAsyncHooksForTest() {
       destroy(asyncId) {
         if (asyncId === id) {
           events.push({ eventName: 'destroy' });
-          hook.disable();
-          resolve(events);
+          destroyed = true;
         }
       }
     }).enable();
   });
 }
 
 function test(binding) {
-  binding.asynccontext.makeCallback(common.mustCall(), { foo: 'foo' });
-  if (!checkAsyncHooks())
+  if (!checkAsyncHooks()) {
     return;
+  }
 
   const hooks = installAsyncHooksForTest();
   const triggerAsyncId = async_hooks.executionAsyncId();
-  hooks.then(actual => {
-    assert.deepStrictEqual(actual, [
-      { eventName: 'init',
-        type: 'async_context_test',
-        triggerAsyncId: triggerAsyncId,
-        resource: { foo: 'foo' } },
-      { eventName: 'before' },
-      { eventName: 'after' },
-      { eventName: 'destroy' }
-    ]);
+  binding.asynccontext.makeCallback(common.mustCall(), { foo: 'foo' });
+  return hooks.then(actual => {
+      assert.deepStrictEqual(actual, [
+        { eventName: 'init',
+          type: 'async_context_test',
+          triggerAsyncId: triggerAsyncId,
+          resource: { foo: 'foo' } },
+        { eventName: 'before' },
+        { eventName: 'after' },
+        { eventName: 'destroy' }
+      ]);
   }).catch(common.mustNotCall());
 }
diff --git a/test/asyncprogressqueueworker.js b/test/asyncprogressqueueworker.js
@@ -1,11 +1,9 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const common = require('./common')
 const assert = require('assert');
-const os = require('os');
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = common.runTest(test);
 
 async function test({ asyncprogressqueueworker }) {
   await success(asyncprogressqueueworker);

diff --git a/test/asyncprogressworker.js b/test/asyncprogressworker.js
@@ -1,10 +1,9 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const common = require('./common')
 const assert = require('assert');
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = common.runTest(test);
 
 async function test({ asyncprogressworker }) {
   await success(asyncprogressworker);

diff --git a/test/asyncworker-nocallback.js b/test/asyncworker-nocallback.js
@@ -1,9 +1,8 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const common = require('./common');
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = common.runTest(test);
 
 async function test(binding) {
   await binding.asyncworker.doWorkNoCallback(true, {})

diff --git a/test/asyncworker-persistent.js b/test/asyncworker-persistent.js
@@ -1,9 +1,6 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
-const common = require('./common');
-const binding = require(`./build/${buildType}/binding.node`);
-const noexceptBinding = require(`./build/${buildType}/binding_noexcept.node`);
 
 function test(binding, succeed) {
   return new Promise((resolve) =>
@@ -21,7 +18,7 @@ function test(binding, succeed) {
     }));
 }
 
-module.exports = test(binding.persistentasyncworker, false)
-  .then(() => test(binding.persistentasyncworker, true))
-  .then(() => test(noexceptBinding.persistentasyncworker, false))
-  .then(() => test(noexceptBinding.persistentasyncworker, true));
+module.exports = require('./common').runTest(async binding => {
+  await test(binding.persistentasyncworker, false);
+  await test(binding.persistentasyncworker, true);
+});
diff --git a/test/asyncworker.js b/test/asyncworker.js
@@ -1,5 +1,4 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
 const common = require('./common');
 
@@ -17,14 +16,27 @@ function checkAsyncHooks() {
   return false;
 }
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = common.runTest(test);
 
 function installAsyncHooksForTest() {
   return new Promise((resolve, reject) => {
     let id;
     const events = [];
-    const hook = async_hooks.createHook({
+    /**
+     * TODO(legendecas): investigate why resolving & disabling hooks in
+     * destroy callback causing crash with case 'callbackscope.js'.
+     */
+     let hook;
+     let destroyed = false;
+     const interval = setInterval(() => {
+       if (destroyed) {
+         hook.disable();
+         clearInterval(interval);
+         resolve(events);
+       }
+     }, 10);
+
+    hook = async_hooks.createHook({
       init(asyncId, type, triggerAsyncId, resource) {
         if (id === undefined && type === 'TestResource') {
           id = asyncId;
@@ -44,8 +56,7 @@ function installAsyncHooksForTest() {
       destroy(asyncId) {
         if (asyncId === id) {
           events.push({ eventName: 'destroy' });
-          hook.disable();
-          resolve(events);
+          destroyed = true;
         }
       }
     }).enable();

diff --git a/test/basic_types/array.js b/test/basic_types/array.js
@@ -1,9 +1,7 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
 
-test(require(`../build/${buildType}/binding.node`));
-test(require(`../build/${buildType}/binding_noexcept.node`));
+module.exports = require('../common').runTest(test);
 
 function test(binding) {
 

diff --git a/test/basic_types/boolean.js b/test/basic_types/boolean.js
@@ -1,9 +1,8 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 
-test(require(`../build/${buildType}/binding.node`));
-test(require(`../build/${buildType}/binding_noexcept.node`));
+module.exports = require('../common').runTest(test);
 
 function test(binding) {
   const bool1 = binding.basic_types_boolean.createBoolean(true);

diff --git a/test/basic_types/number.js b/test/basic_types/number.js
@@ -1,10 +1,8 @@
 'use strict';
 
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
 
-test(require(`../build/${buildType}/binding.node`));
-test(require(`../build/${buildType}/binding_noexcept.node`));
+module.exports = require('../common').runTest(test);
 
 function test(binding) {
   const MIN_INT32 = -2147483648;

diff --git a/test/basic_types/value.js b/test/basic_types/value.js
@@ -1,10 +1,8 @@
 'use strict';
 
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
 
-test(require(`../build/${buildType}/binding.node`));
-test(require(`../build/${buildType}/binding_noexcept.node`));
+module.exports = require('../common').runTest(test);
 
 function test(binding) {
   const externalValue = binding.basic_types_value.createExternal();

diff --git a/test/bigint.js b/test/bigint.js
@@ -1,10 +1,8 @@
 'use strict';
 
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
 
-test(require(`./build/${buildType}/binding.node`));
-test(require(`./build/${buildType}/binding_noexcept.node`));
+module.exports = require('./common').runTest(test);
 
 function test(binding) {
   const {

diff --git a/test/buffer.js b/test/buffer.js
@@ -1,11 +1,10 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
+
 const assert = require('assert');
 const testUtil = require('./testUtil');
 const safeBuffer = require('safe-buffer');
 
-module.exports = test(require(`./build/${buildType}/binding.node`))
-  .then(() => test(require(`./build/${buildType}/binding_noexcept.node`)));
+module.exports = require('./common').runTest(test);
 
 function test(binding) {
   return testUtil.runGCTests([

diff --git a/test/callbackscope.js b/test/callbackscope.js
@@ -1,7 +1,5 @@
 'use strict';
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
-const common = require('./common');
 
 // we only check async hooks on 8.x an higher were
 // they are closer to working properly
@@ -17,16 +15,15 @@ function checkAsyncHooks() {
   return false;
 }
 
-test(require(`./build/${buildType}/binding.node`));
-test(require(`./build/${buildType}/binding_noexcept.node`));
+module.exports = require('./common').runTest(test);
 
 function test(binding) {
   if (!checkAsyncHooks())
     return;
 
   let id;
   let insideHook = false;
-  async_hooks.createHook({
+  const hook = async_hooks.createHook({
     init(asyncId, type, triggerAsyncId, resource) {
       if (id === undefined && type === 'callback_scope_test') {
         id = asyncId;
@@ -42,7 +39,11 @@ function test(binding) {
     }
   }).enable();
 
-  binding.callbackscope.runInCallbackScope(function() {
-    assert(insideHook);
+  return new Promise(resolve => {
+    binding.callbackscope.runInCallbackScope(function() {
+      assert(insideHook);
+      hook.disable();
+      resolve();
+    });
   });
 }
diff --git a/test/common/index.js b/test/common/index.js
@@ -74,3 +74,30 @@ exports.mustNotCall = function(msg) {
     assert.fail(msg || 'function should not have been called');
   };
 };
+
+exports.runTest = async function(test, buildType) {
+  buildType = buildType || process.config.target_defaults.default_configuration;
+
+  const bindings = [
+    `../build/${buildType}/binding.node`,
+    `../build/${buildType}/binding_noexcept.node`,
+  ].map(it => require.resolve(it));
+
+  for (const item of bindings) {
+    await Promise.resolve(test(require(item)))
+      .finally(exports.mustCall());
+  }
+}
+
+exports.runTestWithBindingPath = async function(test, buildType) {
+  buildType = buildType || process.config.target_defaults.default_configuration;
+
+  const bindings = [
+    `../build/${buildType}/binding.node`,
+    `../build/${buildType}/binding_noexcept.node`,
+  ].map(it => require.resolve(it));
+
+  for (const item of bindings) {
+    await test(item);
+  }
+}
diff --git a/test/dataview/dataview.js b/test/dataview/dataview.js
@@ -1,10 +1,7 @@
 'use strict';
 
-const buildType = process.config.target_defaults.default_configuration;
 const assert = require('assert');
-
-test(require(`../build/${buildType}/binding.node`));
-test(require(`../build/${buildType}/binding_noexcept.node`));
+module.exports = require('../common').runTest(test);
 
 function test(binding) {
   function testDataViewCreation(factory, arrayBuffer, offset, length) {