fixup! test: ensure assertions are reached on more tests

Author: aduh95

test/parallel/test-child-process-bad-stdio.js

@@ -36,31 +36,31 @@ function createChild(options, callback) {
 }
 
 test('normal execution of a child process is handled', (_, done) => {
-  createChild({}, (err, stdout, stderr) => {
+  createChild({}, common.mustCall((err, stdout, stderr) => {
     assert.strictEqual(err, null);
     assert.strictEqual(stdout, '');
     assert.strictEqual(stderr, '');
     done();
-  });
+  }));
 });
 
 test('execution with an error event is handled', (_, done) => {
   const error = new Error('foo');
-  const child = createChild({}, (err, stdout, stderr) => {
+  const child = createChild({}, common.mustCall((err, stdout, stderr) => {
     assert.strictEqual(err, error);
     assert.strictEqual(stdout, '');
     assert.strictEqual(stderr, '');
     done();
-  });
+  }));
 
   child.emit('error', error);
 });
 
 test('execution with a killed process is handled', (_, done) => {
-  createChild({ timeout: 1 }, (err, stdout, stderr) => {
+  createChild({ timeout: 1 }, common.mustCall((err, stdout, stderr) => {
     assert.strictEqual(err.killed, true);
     assert.strictEqual(stdout, '');
     assert.strictEqual(stderr, '');
     done();
-  });
+  }));
 });

test/parallel/test-child-process-can-write-to-stdout.js

@@ -2,7 +2,7 @@
 // Tests that a spawned child process can write to stdout without throwing.
 // See https://github.com/nodejs/node-v0.x-archive/issues/1899.
 
-require('../common');
+const common = require('../common');
 const fixtures = require('../common/fixtures');
 const assert = require('assert');
 const spawn = require('child_process').spawn;
@@ -16,7 +16,7 @@ child.stdout.on('data', function(data) {
   output += data;
 });
 
-child.on('exit', function(code, signal) {
+child.on('exit', common.mustCall((code) => {
   assert.strictEqual(code, 0);
   assert.strictEqual(output, 'hello, world!\n');
-});
+}));

test/parallel/test-child-process-cwd.js

@@ -32,7 +32,7 @@ const { spawn } = require('child_process');
 // - whether the child pid is undefined or number,
 // - whether the exit code equals expectCode,
 // - optionally whether the trimmed stdout result matches expectData
-function testCwd(options, expectPidType, expectCode = 0, expectData) {
+function testCwd(options, expectPidType, expectCode = 0, expectData, shouldCallExit = true) {
   const child = spawn(...common.pwdCommand, options);
 
   assert.strictEqual(typeof child.pid, expectPidType);
@@ -47,9 +47,9 @@ function testCwd(options, expectPidType, expectCode = 0, expectData) {
 
   // Can't assert callback, as stayed in to API:
   // _The 'exit' event may or may not fire after an error has occurred._
-  child.on('exit', function(code, signal) {
+  child.on('exit', shouldCallExit ? common.mustCall((code) => {
     assert.strictEqual(code, expectCode);
-  });
+  }) : common.mustNotCall());
 
   child.on('close', common.mustCall(function() {
     if (expectData) {
@@ -68,7 +68,7 @@ function testCwd(options, expectPidType, expectCode = 0, expectData) {
 
 // Assume does-not-exist doesn't exist, expect exitCode=-1 and errno=ENOENT
 {
-  testCwd({ cwd: 'does-not-exist' }, 'undefined', -1)
+  testCwd({ cwd: 'does-not-exist' }, 'undefined', -1, undefined, false)
     .on('error', common.mustCall(function(e) {
       assert.strictEqual(e.code, 'ENOENT');
     }));

test/parallel/test-child-process-disconnect.js

@@ -30,13 +30,13 @@ if (process.argv[2] === 'child') {
 
   // Check that the 'disconnect' event is deferred to the next event loop tick.
   const disconnect = process.disconnect;
-  process.disconnect = function() {
+  process.disconnect = common.mustCall(function() {
     disconnect.apply(this, arguments);
     // If the event is emitted synchronously, we're too late by now.
     process.once('disconnect', common.mustCall(disconnectIsNotAsync));
     // The funky function name makes it show up legible in mustCall errors.
     function disconnectIsNotAsync() {}
-  };
+  });
 
   const server = net.createServer();
 
@@ -81,13 +81,13 @@ if (process.argv[2] === 'child') {
   child.on('exit', common.mustCall());
 
   // When child is listening
-  child.on('message', function(obj) {
+  child.on('message', common.mustCallAtLeast((obj) => {
     if (obj && obj.msg === 'ready') {
 
       // Connect to child using TCP to know if disconnect was emitted
       const socket = net.connect(obj.port);
 
-      socket.on('data', function(data) {
+      socket.on('data', common.mustCallAtLeast((data) => {
         data = data.toString();
 
         // Ready to be disconnected
@@ -103,10 +103,10 @@ if (process.argv[2] === 'child') {
 
         // 'disconnect' is emitted
         childFlag = (data === 'true');
-      });
+      }));
 
     }
-  });
+  }));
 
   process.on('exit', function() {
     assert.strictEqual(childFlag, false);

test/parallel/test-child-process-exec-encoding.js

@@ -22,28 +22,28 @@ if (process.argv[2] === 'child') {
   }
 
   // Test default encoding, which should be utf8.
-  run({}, (stdout, stderr) => {
+  run({}, common.mustCall((stdout, stderr) => {
     assert.strictEqual(typeof stdout, 'string');
     assert.strictEqual(typeof stderr, 'string');
     assert.strictEqual(stdout, expectedStdout);
     assert.strictEqual(stderr, expectedStderr);
-  });
+  }));
 
   // Test explicit utf8 encoding.
-  run({ encoding: 'utf8' }, (stdout, stderr) => {
+  run({ encoding: 'utf8' }, common.mustCall((stdout, stderr) => {
     assert.strictEqual(typeof stdout, 'string');
     assert.strictEqual(typeof stderr, 'string');
     assert.strictEqual(stdout, expectedStdout);
     assert.strictEqual(stderr, expectedStderr);
-  });
+  }));
 
   // Test cases that result in buffer encodings.
   [undefined, null, 'buffer', 'invalid'].forEach((encoding) => {
-    run({ encoding }, (stdout, stderr) => {
+    run({ encoding }, common.mustCall((stdout, stderr) => {
       assert(stdout instanceof Buffer);
       assert(stdout instanceof Buffer);
       assert.strictEqual(stdout.toString(), expectedStdout);
       assert.strictEqual(stderr.toString(), expectedStderr);
-    });
+    }));
   });
 }

test/parallel/test-child-process-execfile.js

@@ -65,14 +65,14 @@ common.expectWarning(
   const ac = new AbortController();
   const { signal } = ac;
 
-  const test = () => {
+  const test = common.mustCall(() => {
     const check = common.mustCall((err) => {
       assert.strictEqual(err.code, 'ABORT_ERR');
       assert.strictEqual(err.name, 'AbortError');
       assert.strictEqual(err.signal, undefined);
     });
     execFile(process.execPath, [echoFixture, 0], { signal }, check);
-  };
+  });
 
   // Verify that it still works the same way now that the signal is aborted.
   test();

test/parallel/test-child-process-flush-stdio.js

@@ -17,7 +17,7 @@ p.on('close', common.mustCall((code, signal) => {
 
 p.stdout.read();
 
-const spawnWithReadable = () => {
+const spawnWithReadable = common.mustCall(() => {
   const buffer = [];
   const p = cp.spawn('echo', ['123'], opts);
   p.on('close', common.mustCall((code, signal) => {
@@ -30,4 +30,4 @@ const spawnWithReadable = () => {
     while ((buf = p.stdout.read()) !== null)
       buffer.push(buf);
   });
-};
+});

test/parallel/test-child-process-fork-closed-channel-segfault.js

@@ -28,7 +28,7 @@ const server = net
       s.destroy();
     }, 100);
   })
-  .listen(0, function() {
+  .listen(0, common.mustCall(() => {
     const worker = cluster.fork();
 
     worker.on('error', function(err) {
@@ -70,9 +70,8 @@ const server = net
       })
     );
 
-    worker.on('online', function() {
-      send(function(err) {
-        assert.ifError(err);
+    worker.on('online', common.mustCall(() => {
+      send(common.mustSucceed(() => {
         send(function(err) {
           // Ignore errors when sending the second handle because the worker
           // may already have exited.
@@ -83,6 +82,6 @@ const server = net
             throw err;
           }
         });
-      });
-    });
-  });
+      }));
+    }));
+  }));

test/parallel/test-child-process-fork-dgram.js

@@ -92,9 +92,7 @@ if (process.argv[2] === 'child') {
           msg.length,
           serverPort,
           '127.0.0.1',
-          (err) => {
-            assert.ifError(err);
-          }
+          common.mustSucceed(),
         );
       }
     }, 1);

test/parallel/test-child-process-fork-net-server.js

@@ -60,15 +60,15 @@ if (process.argv[2] === 'child') {
   // TODO(@jasnell): The close event is not called consistently
   // across platforms. Need to investigate if it can be made
   // more consistent.
-  const onClose = (msg) => {
+  const onClose = common.mustCallAtLeast((msg) => {
     if (msg.what !== 'close') return;
     process.removeListener('message', onClose);
 
     serverScope.on('close', common.mustCall(() => {
       process.send({ what: 'close' });
     }));
     serverScope.close();
-  };
+  });
 
   process.on('message', onClose);
 
@@ -86,13 +86,13 @@ if (process.argv[2] === 'child') {
   function testServer(callback) {
 
     // Destroy server execute callback when done.
-    const countdown = new Countdown(2, () => {
+    const countdown = new Countdown(2, common.mustCall(() => {
       server.on('close', common.mustCall(() => {
         debug('PARENT: server closed');
         child.send({ what: 'close' });
       }));
       server.close();
-    });
+    }));
 
     // We expect 4 connections and close events.
     const connections = new Countdown(4, () => countdown.dec());
@@ -122,7 +122,7 @@ if (process.argv[2] === 'child') {
     // event is emitted appears to be variable across platforms.
     // Need to investigate why and whether it can be made
     // more consistent.
-    const messageHandlers = (msg) => {
+    const messageHandlers = common.mustCallAtLeast((msg) => {
       if (msg.what === 'listening') {
         // Make connections.
         let socket;
@@ -143,7 +143,7 @@ if (process.argv[2] === 'child') {
         child.removeListener('message', messageHandlers);
         callback();
       }
-    };
+    });
 
     child.on('message', messageHandlers);
   }