fixup! crypto: add FIPS indicator diagnostics channel

Signed-off-by: Filip Skokan <panva.ip@gmail.com>

Author: panva

test/parallel/test-diagnostics-channel-crypto-fips-indicator.js

@@ -7,10 +7,12 @@ if (!common.hasCrypto) {
 }
 
 const assert = require('node:assert');
-const { spawnSync } = require('node:child_process');
 const diagnosticsChannel = require('node:diagnostics_channel');
 const { once } = require('node:events');
 const { Worker } = require('node:worker_threads');
+const {
+  spawnSyncAndExitWithoutError,
+} = require('../common/child_process');
 const { hasFIPS, hasOpenSSL } = require('../common/crypto');
 const {
   createHmac,
@@ -26,14 +28,10 @@ if (!hasOpenSSL(3, 4)) {
 } else if (!hasFIPS(3, 4)) {
   common.skip('an active OpenSSL 3.4+ FIPS provider is required');
 } else if (!process.execArgv.includes('--enable-fips-indicator-events')) {
-  const child = spawnSync(
+  spawnSyncAndExitWithoutError(
     process.execPath,
     ['--enable-fips-indicator-events', __filename],
-    { encoding: 'utf8' });
-  assert.strictEqual(
-    child.status,
-    0,
-    `stdout: ${child.stdout}\nstderr: ${child.stderr}`);
+  );
 } else {
   run().then(common.mustCall());
 }
@@ -56,11 +54,8 @@ function nextIndicator() {
 }
 
 function testUnsubscribeDuringDrain(key, privateKey) {
-  let resolve;
   const keepAlive = setInterval(common.mustNotCall(), 10_000);
-  const promise = new Promise((fulfill) => {
-    resolve = fulfill;
-  });
+  const { promise, resolve } = Promise.withResolvers();
   const subscriber = common.mustCall(() => {
     clearInterval(keepAlive);
     assert.strictEqual(