From 8e3fccd2e9e6fe6cfbfddd1ef7a4e1d2b2f2fe9c Mon Sep 17 00:00:00 2001
From: Erick Wendel <erick.workspace@gmail.com>
Date: Fri, 14 Nov 2025 17:56:08 -0300
Subject: [PATCH 1/2] util: add convertProcessSignalToExitCode utility

Add convertProcessSignalToExitCode() to convert signal names to POSIX
exit codes (128 + signal number). Exposed in public util API.
---
 doc/api/util.md      | 32 ++++++++++++++++++++++++++++++++
 lib/internal/util.js | 13 +++++++++++++
 lib/util.js          |  2 ++
 3 files changed, 47 insertions(+)

diff --git a/doc/api/util.md b/doc/api/util.md
index 4a2f9cb9ec56e4..8cb7448d3d2f64 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -89,6 +89,38 @@ callbackFunction((err, ret) => {
 });
 ```
 
+## `util.convertProcessSignalToExitCode(signalCode)`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+* `signalCode` {string} A signal name (e.g., `'SIGTERM'`, `'SIGKILL'`).
+* Returns: {number|null} The exit code, or `null` if the signal is invalid.
+
+The `util.convertProcessSignalToExitCode()` method converts a signal name to its
+corresponding POSIX exit code. Following the POSIX standard, the exit code
+for a process terminated by a signal is calculated as `128 + signal number`.
+
+```mjs
+import { convertProcessSignalToExitCode } from 'node:util';
+
+console.log(convertProcessSignalToExitCode('SIGTERM')); // 143 (128 + 15)
+console.log(convertProcessSignalToExitCode('SIGKILL')); // 137 (128 + 9)
+console.log(convertProcessSignalToExitCode('INVALID')); // null
+```
+
+```cjs
+const { convertProcessSignalToExitCode } = require('node:util');
+
+console.log(convertProcessSignalToExitCode('SIGTERM')); // 143 (128 + 15)
+console.log(convertProcessSignalToExitCode('SIGKILL')); // 137 (128 + 9)
+console.log(convertProcessSignalToExitCode('INVALID')); // null
+```
+
+This is particularly useful when working with processes to determine
+the exit code based on the signal that terminated the process.
+
 ## `util.debuglog(section[, callback])`
 
 <!-- YAML
diff --git a/lib/internal/util.js b/lib/internal/util.js
index 1018cded979b24..c7fcd831ae6fce 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -393,6 +393,18 @@ function convertToValidSignal(signal) {
   throw new ERR_UNKNOWN_SIGNAL(signal);
 }
 
+function convertProcessSignalToExitCode(signalCode) {
+  validateString(signalCode, 'signalCode');
+
+  const signalNumber = signals[signalCode];
+  if (signalNumber === undefined) {
+    return null;
+  }
+
+  // POSIX standard: exit code for signal termination is 128 + signal number.
+  return 128 + signalNumber;
+}
+
 function getConstructorOf(obj) {
   while (obj) {
     const descriptor = ObjectGetOwnPropertyDescriptor(obj, 'constructor');
@@ -956,6 +968,7 @@ module.exports = {
   assignFunctionName,
   cachedResult,
   constructSharedArrayBuffer,
+  convertProcessSignalToExitCode,
   convertToValidSignal,
   createClassWrapper,
   decorateErrorStack,
diff --git a/lib/util.js b/lib/util.js
index 7c75615e5c70da..0baa747acd23d9 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -84,6 +84,7 @@ const { getOptionValue } = require('internal/options');
 const binding = internalBinding('util');
 
 const {
+  convertProcessSignalToExitCode,
   deprecate: internalDeprecate,
   getLazy,
   getSystemErrorMap,
@@ -472,6 +473,7 @@ module.exports = {
                              'The `util._extend` API is deprecated. Please use Object.assign() instead.',
                              'DEP0060'),
   callbackify,
+  convertProcessSignalToExitCode,
   debug: debuglog,
   debuglog,
   deprecate,

From a66469e5dbeab86f92469ad464c017dfb331ec29 Mon Sep 17 00:00:00 2001
From: Erick Wendel <erick.workspace@gmail.com>
Date: Fri, 14 Nov 2025 17:56:23 -0300
Subject: [PATCH 2/2] child_process: set exitCode when killed by signal

Set exitCode to 128 + signal number instead of null when a child
process is terminated by a signal.

Fixes: https://github.com/nodejs/node/issues/60285
---
 doc/api/child_process.md                      | 45 ++++++++++++++-----
 lib/internal/child_process.js                 |  4 +-
 test/abort/test-process-abort-exitcode.js     |  4 +-
 test/common/quic/test-server.mjs              |  3 +-
 test/parallel/test-child-process-destroy.js   |  6 ++-
 .../test-child-process-exec-timeout-expire.js |  3 +-
 .../test-child-process-exec-timeout-kill.js   |  3 +-
 .../test-child-process-fork-abort-signal.js   | 11 ++---
 test/parallel/test-child-process-kill.js      | 16 +++++--
 .../test-child-process-spawn-controller.js    | 17 +++----
 .../test-cluster-kill-infinite-loop.js        |  3 +-
 .../test-cluster-worker-kill-signal.js        |  3 +-
 test/parallel/test-cluster-worker-kill.js     |  5 ++-
 .../test-net-child-process-connect-reset.js   |  3 +-
 test/parallel/test-signal-unregister.js       |  3 +-
 test/pseudo-tty/test-start-trace-sigint.js    |  3 +-
 test/pseudo-tty/test-stop-trace-sigint.js     |  3 +-
 test/pseudo-tty/test-trace-sigint-on-idle.js  |  3 +-
 test/pseudo-tty/test-trace-sigint.js          |  3 +-
 test/sequential/test-tls-psk-client.js        |  3 +-
 20 files changed, 98 insertions(+), 46 deletions(-)

diff --git a/doc/api/child_process.md b/doc/api/child_process.md
index ba7cc2af6bfb14..41c908c329d7ad 100644
--- a/doc/api/child_process.md
+++ b/doc/api/child_process.md
@@ -1446,10 +1446,15 @@ instances of `ChildProcess`.
 
 <!-- YAML
 added: v0.7.7
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/60720
+    description: When the process is terminated by a signal, code is set to
+                 the POSIX exit code instead of null.
 -->
 
-* `code` {number} The exit code if the child process exited on its own, or
-  `null` if the child process terminated due to a signal.
+* `code` {number} The exit code if the child process exited on its own.
+  When the process is terminated by a signal, this is set to the POSIX exit code.
 * `signal` {string} The signal by which the child process was terminated, or
   `null` if the child process did not terminated due to a signal.
 
@@ -1459,10 +1464,10 @@ streams of a child process have been closed. This is distinct from the
 streams. The `'close'` event will always emit after [`'exit'`][] was
 already emitted, or [`'error'`][] if the child process failed to spawn.
 
-If the process exited, `code` is the final exit code of the process, otherwise
-`null`. If the process terminated due to receipt of a signal, `signal` is the
-string name of the signal, otherwise `null`. One of the two will always be
-non-`null`.
+If the process exited, `code` is the final exit code of the process. If the
+process terminated due to receipt of a signal, `signal` is the string name of
+the signal, and `code` will be set to the POSIX exit code. One of the two
+will always be non-`null`.
 
 ```cjs
 const { spawn } = require('node:child_process');
@@ -1535,17 +1540,23 @@ See also [`subprocess.kill()`][] and [`subprocess.send()`][].
 
 <!-- YAML
 added: v0.1.90
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/60720
+    description: When the process is terminated by a signal, code is set to
+                 the POSIX exit code instead of null.
 -->
 
-* `code` {number} The exit code if the child process exited on its own, or
-  `null` if the child process terminated due to a signal.
+* `code` {number} The exit code if the child process exited on its own.
+  When the process is terminated by a signal, this is set to the POSIX exit code.
 * `signal` {string} The signal by which the child process was terminated, or
   `null` if the child process did not terminated due to a signal.
 
 The `'exit'` event is emitted after the child process ends. If the process
-exited, `code` is the final exit code of the process, otherwise `null`. If the
-process terminated due to receipt of a signal, `signal` is the string name of
-the signal, otherwise `null`. One of the two will always be non-`null`.
+exited, `code` is the final exit code of the process. If the process terminated
+due to receipt of a signal, `signal` is the string name of the signal, and
+`code` will be set to the POSIX exit code. One of the two will always be
+non-`null`.
 
 When the `'exit'` event is triggered, child process stdio streams might still be
 open.
@@ -1666,11 +1677,23 @@ within the child process to close the IPC channel as well.
 
 ### `subprocess.exitCode`
 
+<!-- YAML
+added: v0.1.90
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/60720
+    description: When the process is terminated by a signal, exitCode is set
+                 to the POSIX exit code instead of null.
+-->
+
 * Type: {integer}
 
 The `subprocess.exitCode` property indicates the exit code of the child process.
 If the child process is still running, the field will be `null`.
 
+When the process is terminated by a signal, `exitCode` is set to the POSIX
+exit code.
+
 ### `subprocess.kill([signal])`
 
 <!-- YAML
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index f110557a9374f7..f6d12b79b0e060 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -55,7 +55,7 @@ const { TTY } = internalBinding('tty_wrap');
 const { UDP } = internalBinding('udp_wrap');
 const SocketList = require('internal/socket_list');
 const { owner_symbol } = require('internal/async_hooks').symbols;
-const { convertToValidSignal } = require('internal/util');
+const { convertProcessSignalToExitCode, convertToValidSignal } = require('internal/util');
 const { isArrayBufferView } = require('internal/util/types');
 const spawn_sync = internalBinding('spawn_sync');
 const { kStateSymbol } = require('internal/dgram');
@@ -269,8 +269,10 @@ function ChildProcess() {
   this._handle.onexit = (exitCode, signalCode) => {
     if (signalCode) {
       this.signalCode = signalCode;
+      this.exitCode = convertProcessSignalToExitCode(signalCode);
     } else {
       this.exitCode = exitCode;
+      this.signalCode = null;
     }
 
     if (this.stdin) {
diff --git a/test/abort/test-process-abort-exitcode.js b/test/abort/test-process-abort-exitcode.js
index 2aa44024ec05b9..94211bf08344ff 100644
--- a/test/abort/test-process-abort-exitcode.js
+++ b/test/abort/test-process-abort-exitcode.js
@@ -1,6 +1,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 
 // This test makes sure that an aborted node process
 // exits with code 3 on Windows, and SIGABRT on POSIX.
@@ -13,11 +14,10 @@ if (process.argv[2] === 'child') {
 } else {
   const child = spawn(process.execPath, [__filename, 'child']);
   child.on('exit', common.mustCall((code, signal) => {
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGABRT'));
     if (common.isWindows) {
-      assert.strictEqual(code, 134);
       assert.strictEqual(signal, null);
     } else {
-      assert.strictEqual(code, null);
       assert.strictEqual(signal, 'SIGABRT');
     }
   }));
diff --git a/test/common/quic/test-server.mjs b/test/common/quic/test-server.mjs
index 5d0168ed233938..3cb3840823a03c 100644
--- a/test/common/quic/test-server.mjs
+++ b/test/common/quic/test-server.mjs
@@ -1,5 +1,6 @@
 import { resolve } from 'node:path';
 import { spawn } from 'node:child_process';
+import { convertProcessSignalToExitCode } from 'node:util';
 
 export default class QuicTestServer {
   #pathToServer;
@@ -46,7 +47,7 @@ export default class QuicTestServer {
       if (code === 0) {
         resolve();
       } else {
-        if (code === null && signal === 'SIGTERM') {
+        if (code === convertProcessSignalToExitCode('SIGTERM') && signal === 'SIGTERM') {
           // Normal termination due to stop() being called.
           resolve();
           return;
diff --git a/test/parallel/test-child-process-destroy.js b/test/parallel/test-child-process-destroy.js
index 50763bb0315e5d..5b2d4b7db7eb46 100644
--- a/test/parallel/test-child-process-destroy.js
+++ b/test/parallel/test-child-process-destroy.js
@@ -1,6 +1,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 const spawn = require('child_process').spawn;
 const cat = spawn(common.isWindows ? 'cmd' : 'cat');
 
@@ -8,13 +9,14 @@ cat.stdout.on('end', common.mustCall());
 cat.stderr.on('data', common.mustNotCall());
 cat.stderr.on('end', common.mustCall());
 
+const exitCode = convertProcessSignalToExitCode('SIGTERM');
 cat.on('exit', common.mustCall((code, signal) => {
-  assert.strictEqual(code, null);
+  assert.strictEqual(code, exitCode);
   assert.strictEqual(signal, 'SIGTERM');
   assert.strictEqual(cat.signalCode, 'SIGTERM');
 }));
 cat.on('exit', common.mustCall((code, signal) => {
-  assert.strictEqual(code, null);
+  assert.strictEqual(code, exitCode);
   assert.strictEqual(signal, 'SIGTERM');
   assert.strictEqual(cat.signalCode, 'SIGTERM');
 }));
diff --git a/test/parallel/test-child-process-exec-timeout-expire.js b/test/parallel/test-child-process-exec-timeout-expire.js
index 0fd4f85cbc9e3e..dbc037804487af 100644
--- a/test/parallel/test-child-process-exec-timeout-expire.js
+++ b/test/parallel/test-child-process-exec-timeout-expire.js
@@ -5,6 +5,7 @@
 const common = require('../common');
 const assert = require('assert');
 const cp = require('child_process');
+const { convertProcessSignalToExitCode } = require('util');
 
 const {
   cleanupStaleProcess,
@@ -34,7 +35,7 @@ cp.exec(cmd, {
     assert.strictEqual(err.code, 143);
     sigterm = null;
   } else {
-    assert.strictEqual(err.code, null);
+    assert.strictEqual(err.code, convertProcessSignalToExitCode(sigterm));
   }
   // At least starting with Darwin Kernel Version 16.4.0, sending a SIGTERM to a
   // process that is still starting up kills it with SIGKILL instead of SIGTERM.
diff --git a/test/parallel/test-child-process-exec-timeout-kill.js b/test/parallel/test-child-process-exec-timeout-kill.js
index 4938cea8a22384..a64519324cbe96 100644
--- a/test/parallel/test-child-process-exec-timeout-kill.js
+++ b/test/parallel/test-child-process-exec-timeout-kill.js
@@ -5,6 +5,7 @@
 const common = require('../common');
 const assert = require('assert');
 const cp = require('child_process');
+const { convertProcessSignalToExitCode } = require('util');
 
 const {
   cleanupStaleProcess,
@@ -30,7 +31,7 @@ cp.exec(cmd, {
   console.log('[stderr]', stderr.trim());
 
   assert.strictEqual(err.killed, true);
-  assert.strictEqual(err.code, null);
+  assert.strictEqual(err.code, convertProcessSignalToExitCode('SIGKILL'));
   assert.strictEqual(err.signal, 'SIGKILL');
   assert.strictEqual(err.cmd, cmd);
   assert.strictEqual(stdout.trim(), '');
diff --git a/test/parallel/test-child-process-fork-abort-signal.js b/test/parallel/test-child-process-fork-abort-signal.js
index 1d170134f715dd..510ca0548a46ee 100644
--- a/test/parallel/test-child-process-fork-abort-signal.js
+++ b/test/parallel/test-child-process-fork-abort-signal.js
@@ -4,6 +4,7 @@ const { mustCall, mustNotCall } = require('../common');
 const assert = require('assert');
 const fixtures = require('../common/fixtures');
 const { fork } = require('child_process');
+const { convertProcessSignalToExitCode } = require('util');
 
 {
   // Test aborting a forked child_process after calling fork
@@ -13,7 +14,7 @@ const { fork } = require('child_process');
     signal
   });
   cp.on('exit', mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
   cp.on('error', mustCall((err) => {
@@ -30,7 +31,7 @@ const { fork } = require('child_process');
     signal
   });
   cp.on('exit', mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
   cp.on('error', mustCall((err) => {
@@ -48,7 +49,7 @@ const { fork } = require('child_process');
     signal
   });
   cp.on('exit', mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
   cp.on('error', mustCall((err) => {
@@ -63,7 +64,7 @@ const { fork } = require('child_process');
     signal
   });
   cp.on('exit', mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
   cp.on('error', mustCall((err) => {
@@ -81,7 +82,7 @@ const { fork } = require('child_process');
     killSignal: 'SIGKILL',
   });
   cp.on('exit', mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGKILL'));
     assert.strictEqual(killSignal, 'SIGKILL');
   }));
   cp.on('error', mustCall((err) => {
diff --git a/test/parallel/test-child-process-kill.js b/test/parallel/test-child-process-kill.js
index d143b21a8681d1..f090a0f0879a9a 100644
--- a/test/parallel/test-child-process-kill.js
+++ b/test/parallel/test-child-process-kill.js
@@ -22,6 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 const spawn = require('child_process').spawn;
 const cat = spawn(common.isWindows ? 'cmd' : 'cat');
 
@@ -30,9 +31,11 @@ cat.stderr.on('data', common.mustNotCall());
 cat.stderr.on('end', common.mustCall());
 
 cat.on('exit', common.mustCall((code, signal) => {
-  assert.strictEqual(code, null);
+  const expectedExitCode = convertProcessSignalToExitCode('SIGTERM');
+  assert.strictEqual(code, expectedExitCode);
   assert.strictEqual(signal, 'SIGTERM');
   assert.strictEqual(cat.signalCode, 'SIGTERM');
+  assert.strictEqual(cat.exitCode, expectedExitCode);
 }));
 
 assert.strictEqual(cat.signalCode, null);
@@ -45,16 +48,21 @@ if (common.isWindows) {
   for (const sendSignal of ['SIGTERM', 'SIGKILL', 'SIGQUIT', 'SIGINT']) {
     const process = spawn('cmd');
     process.on('exit', (code, signal) => {
-      assert.strictEqual(code, null);
+      const expectedExitCode = convertProcessSignalToExitCode(sendSignal);
+      assert.strictEqual(code, expectedExitCode);
       assert.strictEqual(signal, sendSignal);
+      assert.strictEqual(process.exitCode, expectedExitCode);
     });
     process.kill(sendSignal);
   }
 
   const process = spawn('cmd');
   process.on('exit', (code, signal) => {
-    assert.strictEqual(code, null);
+    const expectedExitCode = convertProcessSignalToExitCode('SIGKILL');
+    assert.strictEqual(code, expectedExitCode);
     assert.strictEqual(signal, 'SIGKILL');
+    assert.strictEqual(process.exitCode, expectedExitCode);
+    assert.strictEqual(process.signalCode, 'SIGKILL');
   });
   process.kill('SIGHUP');
 }
@@ -70,6 +78,8 @@ const checkProcess = spawn(process.execPath, ['-e', code]);
 checkProcess.on('exit', common.mustCall((code, signal) => {
   assert.strictEqual(code, 0);
   assert.strictEqual(signal, null);
+  assert.strictEqual(checkProcess.exitCode, 0);
+  assert.strictEqual(checkProcess.signalCode, null);
 }));
 
 checkProcess.stdout.on('data', common.mustCall((chunk) => {
diff --git a/test/parallel/test-child-process-spawn-controller.js b/test/parallel/test-child-process-spawn-controller.js
index 20facb09b374d5..7845d5a40a068e 100644
--- a/test/parallel/test-child-process-spawn-controller.js
+++ b/test/parallel/test-child-process-spawn-controller.js
@@ -4,6 +4,7 @@ const common = require('../common');
 const assert = require('assert');
 const { spawn } = require('child_process');
 const fixtures = require('../common/fixtures');
+const { convertProcessSignalToExitCode } = require('util');
 
 const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
 {
@@ -16,7 +17,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
   });
 
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -36,7 +37,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
   });
 
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -57,7 +58,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
   });
 
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -77,7 +78,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
     signal,
   });
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -94,7 +95,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
     signal,
   });
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -111,7 +112,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
     signal,
   });
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -131,7 +132,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
   });
 
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(killSignal, 'SIGTERM');
   }));
 
@@ -153,7 +154,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
   });
 
   cp.on('exit', common.mustCall((code, killSignal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGKILL'));
     assert.strictEqual(killSignal, 'SIGKILL');
   }));
 
diff --git a/test/parallel/test-cluster-kill-infinite-loop.js b/test/parallel/test-cluster-kill-infinite-loop.js
index 57781b6972cadb..1f24d4ad2c59bc 100644
--- a/test/parallel/test-cluster-kill-infinite-loop.js
+++ b/test/parallel/test-cluster-kill-infinite-loop.js
@@ -2,6 +2,7 @@
 const common = require('../common');
 const cluster = require('cluster');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (cluster.isPrimary) {
   const worker = cluster.fork();
@@ -13,7 +14,7 @@ if (cluster.isPrimary) {
   }));
 
   worker.on('exit', common.mustCall((code, signal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'));
     assert.strictEqual(signal, 'SIGTERM');
   }));
 } else {
diff --git a/test/parallel/test-cluster-worker-kill-signal.js b/test/parallel/test-cluster-worker-kill-signal.js
index 53e3739eba1679..1b4fc70a4b8211 100644
--- a/test/parallel/test-cluster-worker-kill-signal.js
+++ b/test/parallel/test-cluster-worker-kill-signal.js
@@ -7,6 +7,7 @@
 const common = require('../common');
 const assert = require('assert');
 const cluster = require('cluster');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (cluster.isWorker) {
   // Make the worker run something
@@ -38,7 +39,7 @@ if (cluster.isWorker) {
     const isWorkerProcessStillAlive = common.isAlive(worker.process.pid);
     const numOfRunningWorkers = Object.keys(cluster.workers).length;
 
-    assert.strictEqual(exitCode, null);
+    assert.strictEqual(exitCode, convertProcessSignalToExitCode(KILL_SIGNAL));
     assert.strictEqual(signalCode, KILL_SIGNAL);
     assert.strictEqual(isWorkerProcessStillAlive, false);
     assert.strictEqual(numOfRunningWorkers, 0);
diff --git a/test/parallel/test-cluster-worker-kill.js b/test/parallel/test-cluster-worker-kill.js
index 07ab46304f870f..a4f770403ca361 100644
--- a/test/parallel/test-cluster-worker-kill.js
+++ b/test/parallel/test-cluster-worker-kill.js
@@ -30,6 +30,7 @@
 const common = require('../common');
 const assert = require('assert');
 const cluster = require('cluster');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (cluster.isWorker) {
   const http = require('http');
@@ -44,7 +45,7 @@ if (cluster.isWorker) {
   const expected_results = {
     cluster_emitDisconnect: [1, "the cluster did not emit 'disconnect'"],
     cluster_emitExit: [1, "the cluster did not emit 'exit'"],
-    cluster_exitCode: [null, 'the cluster exited w/ incorrect exitCode'],
+    cluster_exitCode: [convertProcessSignalToExitCode(KILL_SIGNAL), 'the cluster exited w/ incorrect exitCode'],
     cluster_signalCode: [KILL_SIGNAL,
                          'the cluster exited w/ incorrect signalCode'],
     worker_emitDisconnect: [1, "the worker did not emit 'disconnect'"],
@@ -52,7 +53,7 @@ if (cluster.isWorker) {
     worker_state: ['disconnected', 'the worker state is incorrect'],
     worker_exitedAfter: [false, 'the .exitedAfterDisconnect flag is incorrect'],
     worker_died: [true, 'the worker is still running'],
-    worker_exitCode: [null, 'the worker exited w/ incorrect exitCode'],
+    worker_exitCode: [convertProcessSignalToExitCode(KILL_SIGNAL), 'the worker exited w/ incorrect exitCode'],
     worker_signalCode: [KILL_SIGNAL,
                         'the worker exited w/ incorrect signalCode']
   };
diff --git a/test/parallel/test-net-child-process-connect-reset.js b/test/parallel/test-net-child-process-connect-reset.js
index 228ba8ed57fccc..0696f8590f1f54 100644
--- a/test/parallel/test-net-child-process-connect-reset.js
+++ b/test/parallel/test-net-child-process-connect-reset.js
@@ -4,6 +4,7 @@ const common = require('../common');
 const assert = require('assert');
 const { spawn } = require('child_process');
 const net = require('net');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (process.argv[2] === 'child') {
   const server = net.createServer(common.mustCall());
@@ -18,7 +19,7 @@ if (process.argv[2] === 'child') {
                    });
 
   cp.on('exit', common.mustCall((code, signal) => {
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGKILL'));
     assert.strictEqual(signal, 'SIGKILL');
   }));
 
diff --git a/test/parallel/test-signal-unregister.js b/test/parallel/test-signal-unregister.js
index 2c4d3129426bbb..f2d2fd99c39341 100644
--- a/test/parallel/test-signal-unregister.js
+++ b/test/parallel/test-signal-unregister.js
@@ -3,12 +3,13 @@ const common = require('../common');
 const assert = require('assert');
 const spawn = require('child_process').spawn;
 const fixtures = require('../common/fixtures');
+const { convertProcessSignalToExitCode } = require('util');
 
 const child = spawn(process.argv[0], [fixtures.path('should_exit.js')]);
 child.stdout.once('data', function() {
   child.kill('SIGINT');
 });
 child.on('exit', common.mustCall(function(exitCode, signalCode) {
-  assert.strictEqual(exitCode, null);
+  assert.strictEqual(exitCode, convertProcessSignalToExitCode('SIGINT'));
   assert.strictEqual(signalCode, 'SIGINT');
 }));
diff --git a/test/pseudo-tty/test-start-trace-sigint.js b/test/pseudo-tty/test-start-trace-sigint.js
index bbadae61093061..6eec6b574ff559 100644
--- a/test/pseudo-tty/test-start-trace-sigint.js
+++ b/test/pseudo-tty/test-start-trace-sigint.js
@@ -4,6 +4,7 @@ const { mustCall } = require('../common');
 const childProcess = require('child_process');
 const assert = require('assert');
 const util = require('util');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (process.env.CHILD === 'true') {
   main();
@@ -19,7 +20,7 @@ if (process.env.CHILD === 'true') {
     });
   cp.on('exit', mustCall((code, signal) => {
     assert.strictEqual(signal, 'SIGINT');
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGINT'));
   }));
 }
 
diff --git a/test/pseudo-tty/test-stop-trace-sigint.js b/test/pseudo-tty/test-stop-trace-sigint.js
index 363a4008371ba6..0d6ab34d263002 100644
--- a/test/pseudo-tty/test-stop-trace-sigint.js
+++ b/test/pseudo-tty/test-stop-trace-sigint.js
@@ -4,6 +4,7 @@ const { mustCall } = require('../common');
 const childProcess = require('child_process');
 const assert = require('assert');
 const util = require('util');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (process.env.CHILD === 'true') {
   main();
@@ -19,7 +20,7 @@ if (process.env.CHILD === 'true') {
     });
   cp.on('exit', mustCall((code, signal) => {
     assert.strictEqual(signal, 'SIGINT');
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGINT'));
   }));
 }
 
diff --git a/test/pseudo-tty/test-trace-sigint-on-idle.js b/test/pseudo-tty/test-trace-sigint-on-idle.js
index 8d9bbb3a5d2e82..c6c7ba26e94097 100644
--- a/test/pseudo-tty/test-trace-sigint-on-idle.js
+++ b/test/pseudo-tty/test-trace-sigint-on-idle.js
@@ -2,6 +2,7 @@
 const { platformTimeout, mustCall } = require('../common');
 const childProcess = require('child_process');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (process.env.CHILD === 'true') {
   main();
@@ -20,7 +21,7 @@ if (process.env.CHILD === 'true') {
   }));
   cp.on('exit', mustCall((code, signal) => {
     assert.strictEqual(signal, 'SIGINT');
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGINT'));
   }));
 }
 
diff --git a/test/pseudo-tty/test-trace-sigint.js b/test/pseudo-tty/test-trace-sigint.js
index 7429378233f9ec..b6fe35e74ccbf7 100644
--- a/test/pseudo-tty/test-trace-sigint.js
+++ b/test/pseudo-tty/test-trace-sigint.js
@@ -3,6 +3,7 @@
 const { mustCall } = require('../common');
 const childProcess = require('child_process');
 const assert = require('assert');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (process.env.CHILD === 'true') {
   main();
@@ -18,7 +19,7 @@ if (process.env.CHILD === 'true') {
     });
   cp.on('exit', mustCall((code, signal) => {
     assert.strictEqual(signal, 'SIGINT');
-    assert.strictEqual(code, null);
+    assert.strictEqual(code, convertProcessSignalToExitCode('SIGINT'));
   }));
 }
 
diff --git a/test/sequential/test-tls-psk-client.js b/test/sequential/test-tls-psk-client.js
index c9a904e729b830..9f0710ae95e4ff 100644
--- a/test/sequential/test-tls-psk-client.js
+++ b/test/sequential/test-tls-psk-client.js
@@ -1,5 +1,6 @@
 'use strict';
 const common = require('../common');
+const { convertProcessSignalToExitCode } = require('util');
 
 if (!common.hasCrypto) {
   common.skip('missing crypto');
@@ -38,7 +39,7 @@ server.stdout.on('data', (data) => serverOut += data);
 server.on('error', common.mustNotCall());
 server.on('exit', common.mustCall((code, signal) => {
   // Server is expected to be terminated by cleanUp().
-  assert.strictEqual(code, null,
+  assert.strictEqual(code, convertProcessSignalToExitCode('SIGTERM'),
                      `'${server.spawnfile} ${server.spawnargs.join(' ')}' unexpected exited with output:\n${serverOut}\n${serverErr}`);
   assert.strictEqual(signal, 'SIGTERM');
 }));