From 6da446d9e15f5437a915e830c6c77d1bf6c0de9d Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 20 Mar 2024 20:44:14 +0200 Subject: [PATCH] test: add `spawnSyncAndAssert` util PR-URL: https://github.com/nodejs/node/pull/52132 Reviewed-By: Chengzhong Wu Reviewed-By: Moshe Atlow --- test/common/README.md | 10 +++++++--- test/common/child_process.js | 13 ++++++++++--- test/common/sea.js | 10 +++++----- test/common/wasi.js | 6 +++--- test/embedding/test-embedding.js | 16 +++++++--------- test/parallel/test-error-prepare-stack-trace.js | 3 +-- test/parallel/test-snapshot-api.js | 4 ++-- test/parallel/test-snapshot-basic.js | 7 ++++--- .../parallel/test-snapshot-child-process-sync.js | 6 +++--- test/parallel/test-snapshot-config.js | 9 +++++---- test/parallel/test-snapshot-cwd.js | 6 +++--- test/parallel/test-snapshot-warning.js | 12 ++++++------ ...t-single-executable-application-assets-raw.js | 4 +--- .../test-single-executable-application-assets.js | 6 +++--- ...plication-disable-experimental-sea-warning.js | 7 +++---- .../test-single-executable-application-empty.js | 3 +-- ...utable-application-snapshot-and-code-cache.js | 6 +++--- ...est-single-executable-application-snapshot.js | 6 +++--- ...ngle-executable-application-use-code-cache.js | 4 ++-- .../test-single-executable-application.js | 7 +++---- test/sequential/test-worker-prof.js | 4 ++-- 21 files changed, 77 insertions(+), 72 deletions(-) diff --git a/test/common/README.md b/test/common/README.md index 415601d1e25ecb..49b580d280f473 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -70,11 +70,15 @@ gathering more information about test failures coming from child processes. * `stderr` [\][] The output from the child process to stderr. * `stdout` [\][] The output from the child process to stdout. -### `spawnSyncAndExitWithoutError(command[, args][, spawnOptions], expectations)` +### `spawnSyncAndExitWithoutError(command[, args][, spawnOptions])` Similar to `expectSyncExit()` with the `status` expected to be 0 and -`signal` expected to be `null`. Any other optional options are passed -into `expectSyncExit()`. +`signal` expected to be `null`. + +### `spawnSyncAndAssert(command[, args][, spawnOptions], expectations)` + +Similar to `spawnSyncAndExitWithoutError()`, but with an additional +`expectations` parameter. ## Common Module API diff --git a/test/common/child_process.js b/test/common/child_process.js index 35f06e95ae70a8..d555d09a944c1c 100644 --- a/test/common/child_process.js +++ b/test/common/child_process.js @@ -119,9 +119,15 @@ function spawnSyncAndExit(...args) { } function spawnSyncAndExitWithoutError(...args) { - const spawnArgs = args.slice(0, args.length); - const expectations = args[args.length - 1]; - const child = spawnSync(...spawnArgs); + return expectSyncExit(spawnSync(...args), { + status: 0, + signal: null, + }); +} + +function spawnSyncAndAssert(...args) { + const expectations = args.pop(); + const child = spawnSync(...args); return expectSyncExit(child, { status: 0, signal: null, @@ -134,6 +140,7 @@ module.exports = { logAfterTime, kExpiringChildRunTime, kExpiringParentTimer, + spawnSyncAndAssert, spawnSyncAndExit, spawnSyncAndExitWithoutError, }; diff --git a/test/common/sea.js b/test/common/sea.js index f220fbe723332d..863047ab36ff48 100644 --- a/test/common/sea.js +++ b/test/common/sea.js @@ -92,8 +92,8 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow if (process.platform === 'darwin') { try { - spawnSyncAndExitWithoutError('codesign', [ '--sign', '-', targetExecutable ], {}); - spawnSyncAndExitWithoutError('codesign', [ '--verify', targetExecutable ], {}); + spawnSyncAndExitWithoutError('codesign', [ '--sign', '-', targetExecutable ]); + spawnSyncAndExitWithoutError('codesign', [ '--verify', targetExecutable ]); } catch (e) { const message = `Cannot sign ${targetExecutable}: ${inspect(e)}`; if (verifyWorkflow) { @@ -104,7 +104,7 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow console.log(`Signed ${targetExecutable}`); } else if (process.platform === 'win32') { try { - spawnSyncAndExitWithoutError('where', [ 'signtool' ], {}); + spawnSyncAndExitWithoutError('where', [ 'signtool' ]); } catch (e) { const message = `Cannot find signtool: ${inspect(e)}`; if (verifyWorkflow) { @@ -114,8 +114,8 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow } let stderr; try { - ({ stderr } = spawnSyncAndExitWithoutError('signtool', [ 'sign', '/fd', 'SHA256', targetExecutable ], {})); - spawnSyncAndExitWithoutError('signtool', 'verify', '/pa', 'SHA256', targetExecutable, {}); + ({ stderr } = spawnSyncAndExitWithoutError('signtool', [ 'sign', '/fd', 'SHA256', targetExecutable ])); + spawnSyncAndExitWithoutError('signtool', ['verify', '/pa', 'SHA256', targetExecutable]); } catch (e) { const message = `Cannot sign ${targetExecutable}: ${inspect(e)}\n${stderr}`; if (verifyWorkflow) { diff --git a/test/common/wasi.js b/test/common/wasi.js index 5c3cdc9bf4c652..da42c78ef566bd 100644 --- a/test/common/wasi.js +++ b/test/common/wasi.js @@ -1,7 +1,7 @@ // Test version set to preview1 'use strict'; -const { spawnSyncAndExitWithoutError } = require('./child_process'); +const { spawnSyncAndAssert } = require('./child_process'); const fixtures = require('./fixtures'); const childPath = fixtures.path('wasi-preview-1.js'); @@ -15,7 +15,7 @@ function testWasiPreview1(args, spawnArgs = {}, expectations = {}) { spawnArgs.env = newEnv; console.log('Testing with --turbo-fast-api-calls:', ...args); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( process.execPath, [ '--turbo-fast-api-calls', childPath, @@ -26,7 +26,7 @@ function testWasiPreview1(args, spawnArgs = {}, expectations = {}) { ); console.log('Testing with --no-turbo-fast-api-calls:', ...args); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( process.execPath, [ '--no-turbo-fast-api-calls', diff --git a/test/embedding/test-embedding.js b/test/embedding/test-embedding.js index 70bf90d39dd207..21d517b1ec47b1 100644 --- a/test/embedding/test-embedding.js +++ b/test/embedding/test-embedding.js @@ -4,6 +4,7 @@ const fixtures = require('../common/fixtures'); const tmpdir = require('../common/tmpdir'); const assert = require('assert'); const { + spawnSyncAndAssert, spawnSyncAndExit, spawnSyncAndExitWithoutError, } = require('../common/child_process'); @@ -23,7 +24,7 @@ function resolveBuiltBinary(binary) { const binary = resolveBuiltBinary('embedtest'); -spawnSyncAndExitWithoutError( +spawnSyncAndAssert( binary, ['console.log(42)'], { @@ -31,7 +32,7 @@ spawnSyncAndExitWithoutError( stdout: '42', }); -spawnSyncAndExitWithoutError( +spawnSyncAndAssert( binary, ['console.log(embedVars.nön_ascıı)'], { @@ -111,9 +112,8 @@ for (const extraSnapshotArgs of [ spawnSyncAndExitWithoutError( binary, [ '--', ...buildSnapshotArgs ], - { cwd: tmpdir.path }, - {}); - spawnSyncAndExitWithoutError( + { cwd: tmpdir.path }); + spawnSyncAndAssert( binary, [ '--', ...runSnapshotArgs ], { cwd: tmpdir.path }, @@ -145,11 +145,9 @@ for (const extraSnapshotArgs of [ spawnSyncAndExitWithoutError( binary, [ '--', ...buildSnapshotArgs ], - { cwd: tmpdir.path }, - {}); + { cwd: tmpdir.path }); spawnSyncAndExitWithoutError( binary, [ '--', ...runEmbeddedArgs ], - { cwd: tmpdir.path }, - {}); + { cwd: tmpdir.path }); } diff --git a/test/parallel/test-error-prepare-stack-trace.js b/test/parallel/test-error-prepare-stack-trace.js index 0d375a6db38675..1ad29efb168b93 100644 --- a/test/parallel/test-error-prepare-stack-trace.js +++ b/test/parallel/test-error-prepare-stack-trace.js @@ -26,6 +26,5 @@ if (process.argv[2] !== 'child') { // enabled. spawnSyncAndExitWithoutError( process.execPath, - ['--enable-source-maps', __filename, 'child'], - {}); + ['--enable-source-maps', __filename, 'child']); } diff --git a/test/parallel/test-snapshot-api.js b/test/parallel/test-snapshot-api.js index 2396dd32c345c7..8e663d813b49e6 100644 --- a/test/parallel/test-snapshot-api.js +++ b/test/parallel/test-snapshot-api.js @@ -6,7 +6,7 @@ require('../common'); const assert = require('assert'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert, spawnSyncAndExitWithoutError } = require('../common/child_process'); const fs = require('fs'); const v8 = require('v8'); @@ -41,7 +41,7 @@ const entry = fixtures.path('snapshot', 'v8-startup-snapshot-api.js'); } { - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, 'book1', diff --git a/test/parallel/test-snapshot-basic.js b/test/parallel/test-snapshot-basic.js index 760469ed5dc896..2396887fbf36b4 100644 --- a/test/parallel/test-snapshot-basic.js +++ b/test/parallel/test-snapshot-basic.js @@ -8,8 +8,9 @@ const assert = require('assert'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); const { - spawnSyncAndExitWithoutError, + spawnSyncAndAssert, spawnSyncAndExit, + spawnSyncAndExitWithoutError, } = require('../common/child_process'); const fs = require('fs'); @@ -65,7 +66,7 @@ const blobPath = tmpdir.resolve('my-snapshot.blob'); { // Check --help. - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--help', @@ -78,7 +79,7 @@ const blobPath = tmpdir.resolve('my-snapshot.blob'); { // Check -c. - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '-c', diff --git a/test/parallel/test-snapshot-child-process-sync.js b/test/parallel/test-snapshot-child-process-sync.js index 3ec7b2952853ba..f47aa321c1290f 100644 --- a/test/parallel/test-snapshot-child-process-sync.js +++ b/test/parallel/test-snapshot-child-process-sync.js @@ -4,7 +4,7 @@ // restoring state from a snapshot require('../common'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert } = require('../common/child_process'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); const assert = require('assert'); @@ -20,7 +20,7 @@ const expected = [ { // Create the snapshot. - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--build-snapshot', @@ -37,7 +37,7 @@ const expected = [ } { - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, file, diff --git a/test/parallel/test-snapshot-config.js b/test/parallel/test-snapshot-config.js index 43dfda4af7f9a5..45852b103d4520 100644 --- a/test/parallel/test-snapshot-config.js +++ b/test/parallel/test-snapshot-config.js @@ -5,8 +5,9 @@ require('../common'); const assert = require('assert'); const { - spawnSyncAndExitWithoutError, + spawnSyncAndAssert, spawnSyncAndExit, + spawnSyncAndExitWithoutError, } = require('../common/child_process'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); @@ -84,7 +85,7 @@ let sizeWithCache; configPath, ], { cwd: tmpdir.path - }, {}); + }); const stats = fs.statSync(blobPath); assert(stats.isFile()); sizeWithCache = stats.size; @@ -115,14 +116,14 @@ let sizeWithoutCache; NODE_DEBUG_NATIVE: 'CODE_CACHE' }, cwd: tmpdir.path - }, {}); + }); const stats = fs.statSync(blobPath); assert(stats.isFile()); sizeWithoutCache = stats.size; assert(sizeWithoutCache < sizeWithCache, `sizeWithoutCache = ${sizeWithoutCache} >= sizeWithCache ${sizeWithCache}`); // Check the snapshot. - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, checkFile, diff --git a/test/parallel/test-snapshot-cwd.js b/test/parallel/test-snapshot-cwd.js index c41ded27b45a3e..05cfee5c6c0102 100644 --- a/test/parallel/test-snapshot-cwd.js +++ b/test/parallel/test-snapshot-cwd.js @@ -4,7 +4,7 @@ // restoring state from a snapshot require('../common'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert } = require('../common/child_process'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); const fs = require('fs'); @@ -18,7 +18,7 @@ fs.mkdirSync(subdir); { // Create the snapshot. - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--build-snapshot', @@ -32,7 +32,7 @@ fs.mkdirSync(subdir); } { - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, file, diff --git a/test/parallel/test-snapshot-warning.js b/test/parallel/test-snapshot-warning.js index 889fed59db54a9..180b3e3d15ca97 100644 --- a/test/parallel/test-snapshot-warning.js +++ b/test/parallel/test-snapshot-warning.js @@ -9,7 +9,7 @@ require('../common'); const assert = require('assert'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert, spawnSyncAndExitWithoutError } = require('../common/child_process'); const fs = require('fs'); const warningScript = fixtures.path('snapshot', 'warning.js'); @@ -30,7 +30,7 @@ tmpdir.refresh(); const stats = fs.statSync(blobPath); assert(stats.isFile()); - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, warningScript, @@ -49,7 +49,7 @@ tmpdir.refresh(); { console.log('\n# Check snapshot scripts that emit ' + 'warnings and --trace-warnings hint.'); - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--build-snapshot', @@ -68,7 +68,7 @@ tmpdir.refresh(); const stats = fs.statSync(blobPath); assert(stats.isFile()); - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, warningScript, @@ -92,7 +92,7 @@ tmpdir.refresh(); const warningFile1 = tmpdir.resolve('warnings.txt'); const warningFile2 = tmpdir.resolve('warnings2.txt'); - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--redirect-warnings', @@ -120,7 +120,7 @@ tmpdir.refresh(); maxRetries: 3, recursive: false, force: true }); - spawnSyncAndExitWithoutError(process.execPath, [ + spawnSyncAndAssert(process.execPath, [ '--snapshot-blob', blobPath, '--redirect-warnings', diff --git a/test/sequential/test-single-executable-application-assets-raw.js b/test/sequential/test-single-executable-application-assets-raw.js index 4122e8b323a569..a537f4c7d4f5aa 100644 --- a/test/sequential/test-single-executable-application-assets-raw.js +++ b/test/sequential/test-single-executable-application-assets-raw.js @@ -51,8 +51,7 @@ const outputFile = tmpdir.resolve(process.platform === 'win32' ? 'sea.exe' : 'se ...process.env, }, cwd: tmpdir.path - }, - {}); + }); assert(existsSync(seaPrepBlob)); @@ -67,6 +66,5 @@ const outputFile = tmpdir.resolve(process.platform === 'win32' ? 'sea.exe' : 'se __TEST_PERSON_JPG: fixtures.path('person.jpg'), } }, - { } ); } diff --git a/test/sequential/test-single-executable-application-assets.js b/test/sequential/test-single-executable-application-assets.js index ed10e076ced883..5d2df60e9fdaf9 100644 --- a/test/sequential/test-single-executable-application-assets.js +++ b/test/sequential/test-single-executable-application-assets.js @@ -14,6 +14,7 @@ const tmpdir = require('../common/tmpdir'); const { copyFileSync, writeFileSync, existsSync } = require('fs'); const { + spawnSyncAndAssert, spawnSyncAndExit, spawnSyncAndExitWithoutError, } = require('../common/child_process'); @@ -104,14 +105,13 @@ const outputFile = tmpdir.resolve(process.platform === 'win32' ? 'sea.exe' : 'se ...process.env, }, cwd: tmpdir.path - }, - {}); + }); assert(existsSync(seaPrepBlob)); generateSEA(outputFile, process.execPath, seaPrepBlob); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( outputFile, { env: { diff --git a/test/sequential/test-single-executable-application-disable-experimental-sea-warning.js b/test/sequential/test-single-executable-application-disable-experimental-sea-warning.js index 5b1912f1a99eb0..3f7c54b77360bc 100644 --- a/test/sequential/test-single-executable-application-disable-experimental-sea-warning.js +++ b/test/sequential/test-single-executable-application-disable-experimental-sea-warning.js @@ -15,7 +15,7 @@ skipIfSingleExecutableIsNotSupported(); const fixtures = require('../common/fixtures'); const tmpdir = require('../common/tmpdir'); const { copyFileSync, writeFileSync, existsSync } = require('fs'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert, spawnSyncAndExitWithoutError } = require('../common/child_process'); const { join } = require('path'); const assert = require('assert'); @@ -46,14 +46,13 @@ copyFileSync(inputFile, tmpdir.resolve('sea.js')); spawnSyncAndExitWithoutError( process.execPath, ['--experimental-sea-config', 'sea-config.json'], - { cwd: tmpdir.path }, - {}); + { cwd: tmpdir.path }); assert(existsSync(seaPrepBlob)); generateSEA(outputFile, process.execPath, seaPrepBlob); -spawnSyncAndExitWithoutError( +spawnSyncAndAssert( outputFile, [ '-a', '--b=c', 'd' ], { diff --git a/test/sequential/test-single-executable-application-empty.js b/test/sequential/test-single-executable-application-empty.js index d26d72e47dafdd..f90e52f0c704c5 100644 --- a/test/sequential/test-single-executable-application-empty.js +++ b/test/sequential/test-single-executable-application-empty.js @@ -60,5 +60,4 @@ spawnSyncAndExitWithoutError( NODE_DEBUG_NATIVE: 'SEA', ...process.env, } - }, - {}); + }); diff --git a/test/sequential/test-single-executable-application-snapshot-and-code-cache.js b/test/sequential/test-single-executable-application-snapshot-and-code-cache.js index 18d66884e36cd0..6277381b3bde1a 100644 --- a/test/sequential/test-single-executable-application-snapshot-and-code-cache.js +++ b/test/sequential/test-single-executable-application-snapshot-and-code-cache.js @@ -14,7 +14,7 @@ skipIfSingleExecutableIsNotSupported(); const tmpdir = require('../common/tmpdir'); const { writeFileSync, existsSync } = require('fs'); const { - spawnSyncAndExitWithoutError + spawnSyncAndAssert, } = require('../common/child_process'); const { join } = require('path'); const assert = require('assert'); @@ -45,7 +45,7 @@ const outputFile = join(tmpdir.path, process.platform === 'win32' ? 'sea.exe' : } `); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( process.execPath, ['--experimental-sea-config', 'sea-config.json'], { @@ -64,7 +64,7 @@ const outputFile = join(tmpdir.path, process.platform === 'win32' ? 'sea.exe' : generateSEA(outputFile, process.execPath, seaPrepBlob); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( outputFile, { env: { diff --git a/test/sequential/test-single-executable-application-snapshot.js b/test/sequential/test-single-executable-application-snapshot.js index 779b3e9fb5f332..552c86a0a1d9dd 100644 --- a/test/sequential/test-single-executable-application-snapshot.js +++ b/test/sequential/test-single-executable-application-snapshot.js @@ -14,8 +14,8 @@ skipIfSingleExecutableIsNotSupported(); const tmpdir = require('../common/tmpdir'); const { writeFileSync, existsSync } = require('fs'); const { + spawnSyncAndAssert, spawnSyncAndExit, - spawnSyncAndExitWithoutError } = require('../common/child_process'); const assert = require('assert'); @@ -69,7 +69,7 @@ const outputFile = tmpdir.resolve(process.platform === 'win32' ? 'sea.exe' : 'se } `); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( process.execPath, ['--experimental-sea-config', 'sea-config.json'], { @@ -87,7 +87,7 @@ const outputFile = tmpdir.resolve(process.platform === 'win32' ? 'sea.exe' : 'se generateSEA(outputFile, process.execPath, seaPrepBlob); - spawnSyncAndExitWithoutError( + spawnSyncAndAssert( outputFile, { env: { diff --git a/test/sequential/test-single-executable-application-use-code-cache.js b/test/sequential/test-single-executable-application-use-code-cache.js index 151e631eda7ea8..6d1575ecc6fac5 100644 --- a/test/sequential/test-single-executable-application-use-code-cache.js +++ b/test/sequential/test-single-executable-application-use-code-cache.js @@ -15,7 +15,7 @@ skipIfSingleExecutableIsNotSupported(); const fixtures = require('../common/fixtures'); const tmpdir = require('../common/tmpdir'); const { copyFileSync, writeFileSync, existsSync } = require('fs'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert, spawnSyncAndExitWithoutError } = require('../common/child_process'); const { join } = require('path'); const assert = require('assert'); @@ -58,7 +58,7 @@ assert(existsSync(seaPrepBlob)); generateSEA(outputFile, process.execPath, seaPrepBlob); -spawnSyncAndExitWithoutError( +spawnSyncAndAssert( outputFile, [ '-a', '--b=c', 'd' ], { diff --git a/test/sequential/test-single-executable-application.js b/test/sequential/test-single-executable-application.js index 2e5c7c1e5d564a..2f8c346b95702e 100644 --- a/test/sequential/test-single-executable-application.js +++ b/test/sequential/test-single-executable-application.js @@ -14,7 +14,7 @@ skipIfSingleExecutableIsNotSupported(); const fixtures = require('../common/fixtures'); const tmpdir = require('../common/tmpdir'); const { copyFileSync, writeFileSync, existsSync } = require('fs'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert, spawnSyncAndExitWithoutError } = require('../common/child_process'); const { join } = require('path'); const assert = require('assert'); @@ -45,14 +45,13 @@ copyFileSync(inputFile, tmpdir.resolve('sea.js')); spawnSyncAndExitWithoutError( process.execPath, ['--experimental-sea-config', 'sea-config.json'], - { cwd: tmpdir.path }, - {}); + { cwd: tmpdir.path }); assert(existsSync(seaPrepBlob)); generateSEA(outputFile, process.execPath, seaPrepBlob); -spawnSyncAndExitWithoutError( +spawnSyncAndAssert( outputFile, [ '-a', '--b=c', 'd' ], { diff --git a/test/sequential/test-worker-prof.js b/test/sequential/test-worker-prof.js index cb6d580294b1cb..b98b0be953b150 100644 --- a/test/sequential/test-worker-prof.js +++ b/test/sequential/test-worker-prof.js @@ -3,7 +3,7 @@ const common = require('../common'); const tmpdir = require('../common/tmpdir'); const fs = require('fs'); const assert = require('assert'); -const { spawnSyncAndExitWithoutError } = require('../common/child_process'); +const { spawnSyncAndAssert } = require('../common/child_process'); // Test that --prof also tracks Worker threads. // Refs: https://github.com/nodejs/node/issues/24016 @@ -50,7 +50,7 @@ if (process.argv[2] === 'child') { const workerProfRegexp = /worker prof file: (.+\.log)/; const parentProfRegexp = /parent prof file: (.+\.log)/; - const { stdout } = spawnSyncAndExitWithoutError( + const { stdout } = spawnSyncAndAssert( process.execPath, ['--prof', __filename, 'child'], { cwd: tmpdir.path, encoding: 'utf8' }, { stdout(output) {