Skip to content

Commit

Permalink
test: fix addons and node-api test assumptions
Browse files Browse the repository at this point in the history
PR-URL: #55441
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
aduh95 committed Oct 23, 2024
1 parent 94e863c commit 6c8564b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion test/addons/repl-domain-abort/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ process.on('exit', () => {

const lines = [
// This line shouldn't cause an assertion error.
`require('${buildPath}')` +
`require(${JSON.stringify(buildPath)})` +
// Log output to double check callback ran.
'.method(function(v1, v2) {' +
'console.log(\'cb_ran\'); return v1 === true && v2 === false; });',
Expand Down
9 changes: 2 additions & 7 deletions test/node-api/test_instance_data/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,8 @@ if (module !== require.main) {
function testProcessExit(addonName) {
// Make sure that process exit is clean when the instance data has
// references to JS objects.
const path = require
.resolve(`./build/${common.buildType}/${addonName}`)
// Replace any backslashes with double backslashes because they'll be re-
// interpreted back to single backslashes in the command line argument
// to the child process. Windows needs this.
.replace(/\\/g, '\\\\');
const child = spawnSync(process.execPath, ['-e', `require('${path}');`]);
const path = require.resolve(`./build/${common.buildType}/${addonName}`);
const child = spawnSync(process.execPath, ['-e', `require(${JSON.stringify(path)});`]);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.status, 0);
assert.strictEqual(child.stderr.toString(), 'addon_free');
Expand Down
7 changes: 2 additions & 5 deletions test/node-api/test_uv_threadpool_size/node-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ if (process.config.variables.node_without_node_options) {
const uvThreadPoolPath = '../../fixtures/dotenv/uv-threadpool.env';

// Should update UV_THREADPOOL_SIZE
let filePath = path.join(__dirname, `./build/${common.buildType}/test_uv_threadpool_size`);
if (common.isWindows) {
filePath = filePath.replaceAll('\\', '\\\\');
}
const filePath = path.join(__dirname, `./build/${common.buildType}/test_uv_threadpool_size`);
const code = `
const { test } = require('${filePath}');
const { test } = require(${JSON.stringify(filePath)});
const size = parseInt(process.env.UV_THREADPOOL_SIZE, 10);
require('assert').strictEqual(size, 4);
test(size);
Expand Down

0 comments on commit 6c8564b

Please sign in to comment.