From d84d82a580558de9a5812b6c3603d99fc86baed5 Mon Sep 17 00:00:00 2001
From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:23:55 +0100
Subject: [PATCH 1/2] test: fix watch test with require not testing pid

---
 test/sequential/test-watch-mode.mjs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/sequential/test-watch-mode.mjs b/test/sequential/test-watch-mode.mjs
index cbfde306d6c963..0678386fe71f38 100644
--- a/test/sequential/test-watch-mode.mjs
+++ b/test/sequential/test-watch-mode.mjs
@@ -279,9 +279,9 @@ console.log(values.random);
     const file = createTmpFile();
     const required = createTmpFile('process._rawDebug(\'pid\', process.pid);');
     const args = ['--require', required, file];
-    const { stdout, pid } = await runWriteSucceed({ file, watchedFile: file, args });
+    const { stdout, pid, stderr } = await runWriteSucceed({ file, watchedFile: file, args });
 
-    const importPid = parseInt(stdout[0].split(' ')[1], 10);
+    const importPid = parseInt(stderr[0].split(' ')[1], 10);
     assert.notStrictEqual(pid, importPid);
     assert.deepStrictEqual(stdout, [
       'running',
@@ -296,10 +296,13 @@ console.log(values.random);
     const file = createTmpFile();
     const imported = "data:text/javascript,process._rawDebug('pid', process.pid);";
     const args = ['--import', imported, file];
-    const { stdout, pid } = await runWriteSucceed({ file, watchedFile: file, args });
+    const { stdout, pid, stderr } = await runWriteSucceed({ file, watchedFile: file, args });
 
-    const importPid = parseInt(stdout[0].split(' ')[1], 10);
+    const importPid = parseInt(stderr.split('\n')[0].split(' ')[1], 10);
+
+    assert.strictEqual(Number.isNaN(importPid), false);
     assert.notStrictEqual(pid, importPid);
+
     assert.deepStrictEqual(stdout, [
       'running',
       `Completed running ${inspect(file)}`,

From 87074ea57c32e75fdb802d01e84d6f9fe7fcff73 Mon Sep 17 00:00:00 2001
From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com>
Date: Sat, 6 Apr 2024 21:54:56 +0300
Subject: [PATCH 2/2] watch: code review changes

---
 test/sequential/test-watch-mode.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sequential/test-watch-mode.mjs b/test/sequential/test-watch-mode.mjs
index 0678386fe71f38..9712a223b92ed8 100644
--- a/test/sequential/test-watch-mode.mjs
+++ b/test/sequential/test-watch-mode.mjs
@@ -298,9 +298,9 @@ console.log(values.random);
     const args = ['--import', imported, file];
     const { stdout, pid, stderr } = await runWriteSucceed({ file, watchedFile: file, args });
 
-    const importPid = parseInt(stderr.split('\n')[0].split(' ')[1], 10);
+    const importPid = parseInt(stderr.split('\n', 1)[0].split(' ', 2)[1], 10);
 
-    assert.strictEqual(Number.isNaN(importPid), false);
+    assert.notStrictEqual(importPid, NaN);
     assert.notStrictEqual(pid, importPid);
 
     assert.deepStrictEqual(stdout, [