From e4d5211126a2ea83223421be0f1df9cc37556d47 Mon Sep 17 00:00:00 2001 From: Moshe Atlow Date: Mon, 3 Oct 2022 15:14:17 +0300 Subject: [PATCH] test: split watch mode inspector tests to sequential PR-URL: https://github.com/nodejs/node/pull/44551 Backport-PR-URL: https://github.com/nodejs/node/pull/44976 Reviewed-By: Kohei Ueno Reviewed-By: Benjamin Gruenbaum Reviewed-By: Nitzan Uziely --- test/parallel/test-watch-mode.mjs | 65 ------------------ test/sequential/test-watch-mode-inspect.mjs | 73 +++++++++++++++++++++ 2 files changed, 73 insertions(+), 65 deletions(-) create mode 100644 test/sequential/test-watch-mode-inspect.mjs diff --git a/test/parallel/test-watch-mode.mjs b/test/parallel/test-watch-mode.mjs index 83226c96ca5..c072fc70216 100644 --- a/test/parallel/test-watch-mode.mjs +++ b/test/parallel/test-watch-mode.mjs @@ -10,8 +10,6 @@ import { writeFileSync, readFileSync } from 'node:fs'; import { inspect } from 'node:util'; import { once } from 'node:events'; import { setTimeout } from 'node:timers/promises'; -import { NodeInstance } from '../common/inspector-helper.js'; - if (common.isIBMi) common.skip('IBMi does not support `fs.watch()`'); @@ -234,67 +232,4 @@ describe('watch mode', { concurrency: false, timeout: 60_0000 }, () => { `Completed running ${inspect(file)}`, `Restarting ${inspect(file)}`, `Completed running ${inspect(file)}`, '', ].join('\n')); }); - - describe('inspect', { - skip: Boolean(process.config.variables.coverage || !process.features.inspector), - }, () => { - const silentLogger = { log: () => {}, error: () => {} }; - async function getDebuggedPid(instance, waitForLog = true) { - const session = await instance.connectInspectorSession(); - await session.send({ method: 'Runtime.enable' }); - if (waitForLog) { - await session.waitForConsoleOutput('log', 'safe to debug now'); - } - const { value: innerPid } = (await session.send({ - 'method': 'Runtime.evaluate', 'params': { 'expression': 'process.pid' } - })).result; - session.disconnect(); - return innerPid; - } - - it('should start debugger on inner process', async () => { - const file = fixtures.path('watch-mode/inspect.js'); - const instance = new NodeInstance(['--inspect=0', '--watch'], undefined, file, silentLogger); - let stderr = ''; - instance.on('stderr', (data) => { stderr += data; }); - - const pids = [instance.pid]; - pids.push(await getDebuggedPid(instance)); - instance.resetPort(); - writeFileSync(file, readFileSync(file)); - pids.push(await getDebuggedPid(instance)); - - await instance.kill(); - - // There should be 3 pids (one parent + 2 restarts). - // Message about Debugger should only appear twice. - assert.strictEqual(stderr.match(/Debugger listening on ws:\/\//g).length, 2); - assert.strictEqual(new Set(pids).size, 3); - }); - - it('should prevent attaching debugger with SIGUSR1 to outer process', { skip: common.isWindows }, async () => { - const file = fixtures.path('watch-mode/inspect_with_signal.js'); - const instance = new NodeInstance(['--inspect-port=0', '--watch'], undefined, file, silentLogger); - let stderr = ''; - instance.on('stderr', (data) => { stderr += data; }); - - const loggedPid = await new Promise((resolve) => { - instance.on('stdout', (data) => { - const matches = data.match(/pid is (\d+)/); - if (matches) resolve(Number(matches[1])); - }); - }); - - - process.kill(instance.pid, 'SIGUSR1'); - process.kill(loggedPid, 'SIGUSR1'); - const debuggedPid = await getDebuggedPid(instance, false); - - await instance.kill(); - - // Message about Debugger should only appear once in inner process. - assert.strictEqual(stderr.match(/Debugger listening on ws:\/\//g).length, 1); - assert.strictEqual(loggedPid, debuggedPid); - }); - }); }); diff --git a/test/sequential/test-watch-mode-inspect.mjs b/test/sequential/test-watch-mode-inspect.mjs new file mode 100644 index 00000000000..76eb77fa265 --- /dev/null +++ b/test/sequential/test-watch-mode-inspect.mjs @@ -0,0 +1,73 @@ +import * as common from '../common/index.mjs'; +import * as fixtures from '../common/fixtures.mjs'; +import assert from 'node:assert'; +import { describe, it } from 'node:test'; +import { writeFileSync, readFileSync } from 'node:fs'; +import { NodeInstance } from '../common/inspector-helper.js'; + + +if (common.isIBMi) + common.skip('IBMi does not support `fs.watch()`'); + +common.skipIfInspectorDisabled(); + +describe('watch mode - inspect', () => { + const silentLogger = { log: () => {}, error: () => {} }; + async function getDebuggedPid(instance, waitForLog = true) { + const session = await instance.connectInspectorSession(); + await session.send({ method: 'Runtime.enable' }); + if (waitForLog) { + await session.waitForConsoleOutput('log', 'safe to debug now'); + } + const { value: innerPid } = (await session.send({ + 'method': 'Runtime.evaluate', 'params': { 'expression': 'process.pid' } + })).result; + session.disconnect(); + return innerPid; + } + + it('should start debugger on inner process', async () => { + const file = fixtures.path('watch-mode/inspect.js'); + const instance = new NodeInstance(['--inspect=0', '--watch'], undefined, file, silentLogger); + let stderr = ''; + instance.on('stderr', (data) => { stderr += data; }); + + const pids = [instance.pid]; + pids.push(await getDebuggedPid(instance)); + instance.resetPort(); + writeFileSync(file, readFileSync(file)); + pids.push(await getDebuggedPid(instance)); + + await instance.kill(); + + // There should be 3 pids (one parent + 2 restarts). + // Message about Debugger should only appear twice. + assert.strictEqual(stderr.match(/Debugger listening on ws:\/\//g).length, 2); + assert.strictEqual(new Set(pids).size, 3); + }); + + it('should prevent attaching debugger with SIGUSR1 to outer process', { skip: common.isWindows }, async () => { + const file = fixtures.path('watch-mode/inspect_with_signal.js'); + const instance = new NodeInstance(['--inspect-port=0', '--watch'], undefined, file, silentLogger); + let stderr = ''; + instance.on('stderr', (data) => { stderr += data; }); + + const loggedPid = await new Promise((resolve) => { + instance.on('stdout', (data) => { + const matches = data.match(/pid is (\d+)/); + if (matches) resolve(Number(matches[1])); + }); + }); + + + process.kill(instance.pid, 'SIGUSR1'); + process.kill(loggedPid, 'SIGUSR1'); + const debuggedPid = await getDebuggedPid(instance, false); + + await instance.kill(); + + // Message about Debugger should only appear once in inner process. + assert.strictEqual(stderr.match(/Debugger listening on ws:\/\//g).length, 1); + assert.strictEqual(loggedPid, debuggedPid); + }); +});