test: refactor few tests with collectStream/collectChildStreams utils

Author: lundibundi

test/addons/openssl-client-cert-engine/test.js

@@ -1,5 +1,6 @@
 'use strict';
 const common = require('../../common');
+const { collectStream } = require('../../common/streams');
 const fixture = require('../../common/fixtures');
 
 if (!common.hasCrypto)
@@ -44,13 +45,7 @@ const server = https.createServer(serverOptions, common.mustCall((req, res) => {
   };
 
   const req = https.request(clientOptions, common.mustCall((response) => {
-    let body = '';
-    response.setEncoding('utf8');
-    response.on('data', (chunk) => {
-      body += chunk;
-    });
-
-    response.on('end', common.mustCall(() => {
+    collectStream(response).then(common.mustCall((body) => {
       assert.strictEqual(body, 'hello world');
       server.close();
     }));

test/addons/openssl-key-engine/test.js

@@ -1,5 +1,6 @@
 'use strict';
 const common = require('../../common');
+const { collectStream } = require('../../common/streams');
 const fixture = require('../../common/fixtures');
 
 if (!common.hasCrypto)
@@ -46,13 +47,7 @@ const server = https.createServer(serverOptions, common.mustCall((req, res) => {
   };
 
   const req = https.request(clientOptions, common.mustCall((response) => {
-    let body = '';
-    response.setEncoding('utf8');
-    response.on('data', (chunk) => {
-      body += chunk;
-    });
-
-    response.on('end', common.mustCall(() => {
+    collectStream(response).then(common.mustCall((body) => {
       assert.strictEqual(body, 'hello world');
       server.close();
     }));

test/parallel/test-cli-node-options.js

@@ -9,6 +9,7 @@ const assert = require('assert');
 const exec = require('child_process').execFile;
 const { Worker } = require('worker_threads');
 
+const { collectStream } = require('../common/streams');
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 
@@ -112,15 +113,6 @@ function expect(
     workerTest(opts, command, wantsError, test('worker'));
 }
 
-async function collectStream(readable) {
-  readable.setEncoding('utf8');
-  let data = '';
-  for await (const chunk of readable) {
-    data += chunk;
-  }
-  return data;
-}
-
 function workerTest(opts, command, wantsError, test) {
   let workerError = null;
   const worker = new Worker(command, {

test/parallel/test-tracing-no-crash.js

@@ -1,22 +1,18 @@
 'use strict';
 const common = require('../common');
+const { collectChildStreams } = require('../common/streams');
 const assert = require('assert');
+const { once } = require('events');
 const { spawn } = require('child_process');
 
-function CheckNoSignalAndErrorCodeOne(code, signal) {
-  assert.strictEqual(signal, null);
-  assert.strictEqual(code, 1);
-}
-
 const child = spawn(process.execPath, [
   '--trace-event-categories', 'madeup', '-e', 'throw new Error()'
 ], { stdio: [ 'inherit', 'inherit', 'pipe' ] });
-child.on('exit', common.mustCall(CheckNoSignalAndErrorCodeOne));
 
-let stderr;
-child.stderr.setEncoding('utf8');
-child.stderr.on('data', (chunk) => stderr += chunk);
-child.stderr.on('end', common.mustCall(() => {
-  assert(stderr.includes('throw new Error()'), stderr);
-  assert(!stderr.includes('Could not open trace file'), stderr);
-}));
+collectChildStreams(child, once(child, 'exit'))
+  .then(common.mustCall(({ stderr, data: [code, signal] }) => {
+    assert(stderr.includes('throw new Error()'), stderr);
+    assert(!stderr.includes('Could not open trace file'), stderr);
+    assert.strictEqual(signal, null);
+    assert.strictEqual(code, 1);
+  }));