diff --git a/test/common/README.md b/test/common/README.md index a231adb92da69f..f961185f75e490 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -9,6 +9,7 @@ This directory contains modules used to test the Node.js implementation. * [Common module API](#common-module-api) * [Countdown module](#countdown-module) * [CPU Profiler module](#cpu-profiler-module) +* [Debugger module](#debugger-module) * [DNS module](#dns-module) * [Duplex pair helper](#duplex-pair-helper) * [Environment variables](#environment-variables) @@ -16,7 +17,6 @@ This directory contains modules used to test the Node.js implementation. * [Heap dump checker module](#heap-dump-checker-module) * [hijackstdio module](#hijackstdio-module) * [HTTP2 module](#http2-module) -* [Inspector CLI module](#inspector-cli-module) * [Internet module](#internet-module) * [ongc module](#ongc-module) * [Report module](#report-module) @@ -513,6 +513,34 @@ Sampling interval in microseconds. Throws an `AssertionError` if there are no call frames with the expected `suffix` in the profiling data contained in `file`. +## Debugger module + +Provides common functionality for tests for `node inspect`. + +### `startCLI(args[[, flags], spawnOpts])` + +* `args` [<string>][] +* `flags` [<string>][] default = [] +* `showOpts` [<Object>][] default = {} +* return [<Object>][] + +Returns a null-prototype object with properties that are functions and getters +used to interact with the `node inspect` CLI. These functions are: + +* `flushOutput()` +* `waitFor()` +* `waitForPrompt()` +* `waitForInitialBreak()` +* `breakInfo` +* `ctrlC()` +* `output` +* `rawOutput` +* `parseSourceLines()` +* `writeLine()` +* `command()` +* `stepCommand()` +* `quit()` + ## `DNS` Module The `DNS` module provides utilities related to the `dns` built-in module. @@ -831,34 +859,6 @@ upon initial establishment of a connection. socket.write(http2.kClientMagic); ``` -## Inspector CLI module - -Provides common functionality for tests for `node inspect`. - -### `startCLI(args[[, flags], spawnOpts])` - -* `args` [<string>][] -* `flags` [<string>][] default = [] -* `showOpts` [<Object>][] default = {} -* return [<Object>][] - -Returns a null-prototype object with properties that are functions and getters -used to interact with the `node inspect` CLI. These functions are: - -* `flushOutput()` -* `waitFor()` -* `waitForPrompt()` -* `waitForInitialBreak()` -* `breakInfo` -* `ctrlC()` -* `output` -* `rawOutput` -* `parseSourceLines()` -* `writeLine()` -* `command()` -* `stepCommand()` -* `quit()` - ## Internet Module The `common/internet` module provides utilities for working with diff --git a/test/common/inspector-cli.js b/test/common/debugger.js similarity index 100% rename from test/common/inspector-cli.js rename to test/common/debugger.js diff --git a/test/parallel/test-debugger-address.js b/test/parallel/test-debugger-address.js index 549fc7e558b246..95dd1c6e3f8283 100644 --- a/test/parallel/test-debugger-address.js +++ b/test/parallel/test-debugger-address.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const { spawn } = require('child_process'); diff --git a/test/sequential/test-debugger-auto-resume.js b/test/sequential/test-debugger-auto-resume.js index 00655167e9eb88..8a25f5fc804e1a 100644 --- a/test/sequential/test-debugger-auto-resume.js +++ b/test/sequential/test-debugger-auto-resume.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const { addLibraryPath } = require('../common/shared-lib-util'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 1d5278b9d95979..f362e98068f15e 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-break.js b/test/sequential/test-debugger-break.js index 01a1dff6d91856..7c92aedc435eab 100644 --- a/test/sequential/test-debugger-break.js +++ b/test/sequential/test-debugger-break.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-clear-breakpoints.js b/test/sequential/test-debugger-clear-breakpoints.js index 8b0705860b5394..91349e105a1160 100644 --- a/test/sequential/test-debugger-clear-breakpoints.js +++ b/test/sequential/test-debugger-clear-breakpoints.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-custom-port.js b/test/sequential/test-debugger-custom-port.js index 222aec961c004a..e6cee10ffa53b5 100644 --- a/test/sequential/test-debugger-custom-port.js +++ b/test/sequential/test-debugger-custom-port.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-exceptions.js b/test/sequential/test-debugger-exceptions.js index 27e3e803806b78..9b1163316268c7 100644 --- a/test/sequential/test-debugger-exceptions.js +++ b/test/sequential/test-debugger-exceptions.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-exec-scope.js b/test/sequential/test-debugger-exec-scope.js index cf19d8b43d1aad..9e5d2ac7ebaeeb 100644 --- a/test/sequential/test-debugger-exec-scope.js +++ b/test/sequential/test-debugger-exec-scope.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-exec.js b/test/sequential/test-debugger-exec.js index 01e94f31fd700b..68a9b37d09d6aa 100644 --- a/test/sequential/test-debugger-exec.js +++ b/test/sequential/test-debugger-exec.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-heap-profiler.js b/test/sequential/test-debugger-heap-profiler.js index d69869a78db1b8..86eb9d9d0d232f 100644 --- a/test/sequential/test-debugger-heap-profiler.js +++ b/test/sequential/test-debugger-heap-profiler.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const tmpdir = require('../common/tmpdir'); const path = require('path'); diff --git a/test/sequential/test-debugger-help.js b/test/sequential/test-debugger-help.js index 5e22085b16a7c9..e24f873212b589 100644 --- a/test/sequential/test-debugger-help.js +++ b/test/sequential/test-debugger-help.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-invalid-args.js b/test/sequential/test-debugger-invalid-args.js index ef2da6cc33ecf6..5275d2b1dac9bd 100644 --- a/test/sequential/test-debugger-invalid-args.js +++ b/test/sequential/test-debugger-invalid-args.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const { createServer } = require('net'); diff --git a/test/sequential/test-debugger-launch.js b/test/sequential/test-debugger-launch.js index 0a6afea17342a9..3bfe541ecca05c 100644 --- a/test/sequential/test-debugger-launch.js +++ b/test/sequential/test-debugger-launch.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-low-level.js b/test/sequential/test-debugger-low-level.js index c6152764e6cd90..f6d97f2dfe153d 100644 --- a/test/sequential/test-debugger-low-level.js +++ b/test/sequential/test-debugger-low-level.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); // Debugger agent direct access. diff --git a/test/sequential/test-debugger-pid.js b/test/sequential/test-debugger-pid.js index cb75681cab46a9..402c1f86dd4ed9 100644 --- a/test/sequential/test-debugger-pid.js +++ b/test/sequential/test-debugger-pid.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const { spawn } = require('child_process'); diff --git a/test/sequential/test-debugger-preserve-breaks.js b/test/sequential/test-debugger-preserve-breaks.js index 2b407a8ea1858f..fbc463af96a1e6 100644 --- a/test/sequential/test-debugger-preserve-breaks.js +++ b/test/sequential/test-debugger-preserve-breaks.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-profile.js b/test/sequential/test-debugger-profile.js index 8187c617f4cb80..992c6f71c00775 100644 --- a/test/sequential/test-debugger-profile.js +++ b/test/sequential/test-debugger-profile.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-random-port-with-inspect-port.js b/test/sequential/test-debugger-random-port-with-inspect-port.js index 02ad004eb6a5be..5617e130f02585 100644 --- a/test/sequential/test-debugger-random-port-with-inspect-port.js +++ b/test/sequential/test-debugger-random-port-with-inspect-port.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-random-port.js b/test/sequential/test-debugger-random-port.js index 656b0b2c7431ef..da8656cf1c7115 100644 --- a/test/sequential/test-debugger-random-port.js +++ b/test/sequential/test-debugger-random-port.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-run-after-quit-restart.js b/test/sequential/test-debugger-run-after-quit-restart.js index 33e2d15ef5dcbc..a9da07dcdff8bd 100644 --- a/test/sequential/test-debugger-run-after-quit-restart.js +++ b/test/sequential/test-debugger-run-after-quit-restart.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-sb-before-load.js b/test/sequential/test-debugger-sb-before-load.js index 471611b822402d..586687800e8e90 100644 --- a/test/sequential/test-debugger-sb-before-load.js +++ b/test/sequential/test-debugger-sb-before-load.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); const path = require('path'); diff --git a/test/sequential/test-debugger-scripts.js b/test/sequential/test-debugger-scripts.js index 21d5b28824f15a..8a4491814427c0 100644 --- a/test/sequential/test-debugger-scripts.js +++ b/test/sequential/test-debugger-scripts.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-use-strict.js b/test/sequential/test-debugger-use-strict.js index 1f2dd563fdddc9..ae82a9fc82352b 100644 --- a/test/sequential/test-debugger-use-strict.js +++ b/test/sequential/test-debugger-use-strict.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert'); diff --git a/test/sequential/test-debugger-watchers.js b/test/sequential/test-debugger-watchers.js index 0c2f875aa72d2d..e856132b74e28a 100644 --- a/test/sequential/test-debugger-watchers.js +++ b/test/sequential/test-debugger-watchers.js @@ -4,7 +4,7 @@ const common = require('../common'); common.skipIfInspectorDisabled(); const fixtures = require('../common/fixtures'); -const startCLI = require('../common/inspector-cli'); +const startCLI = require('../common/debugger'); const assert = require('assert');