Commit 49e0883
debugger: indicate server is ending
Currently, we say "listening" when we are ending the server. Change it
to "ending".
Fixes: #39272
PR-URL: #39334
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yash Ladha <yash@yashladha.in>1 parent edc5791 commit 49e0883
2 files changed
Lines changed: 8 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -234,14 +234,16 @@ void PrintDebuggerReadyMessage( | |||
| 234 | 234 | const std::string& host, | |
| 235 | 235 | const std::vector<InspectorSocketServer::ServerSocketPtr>& server_sockets, | |
| 236 | 236 | const std::vector<std::string>& ids, | |
| 237 | + const char* verb, | ||
| 237 | 238 | bool publish_uid_stderr, | |
| 238 | 239 | FILE* out) { | |
| 239 | 240 | if (!publish_uid_stderr || out == nullptr) { | |
| 240 | 241 | return; | |
| 241 | 242 | } | |
| 242 | 243 | for (const auto& server_socket : server_sockets) { | |
| 243 | 244 | for (const std::string& id : ids) { | |
| 244 | - fprintf(out, "Debugger listening on %s\n", | ||
| 245 | + fprintf(out, "Debugger %s on %s\n", | ||
| 246 | + verb, | ||
| 245 | 247 | FormatWsAddress(host, server_socket->port(), id, true).c_str()); | |
| 246 | 248 | } | |
| 247 | 249 | } | |
@@ -300,6 +302,7 @@ void InspectorSocketServer::SessionTerminated(int session_id) { | |||
| 300 | 302 | PrintDebuggerReadyMessage(host_, | |
| 301 | 303 | server_sockets_, | |
| 302 | 304 | delegate_->GetTargetIds(), | |
| 305 | + "ending", | ||
| 303 | 306 | inspect_publish_uid_.console, | |
| 304 | 307 | out_); | |
| 305 | 308 | } | |
@@ -425,6 +428,7 @@ bool InspectorSocketServer::Start() { | |||
| 425 | 428 | PrintDebuggerReadyMessage(host_, | |
| 426 | 429 | server_sockets_, | |
| 427 | 430 | delegate_->GetTargetIds(), | |
| 431 | + "listening", | ||
| 428 | 432 | inspect_publish_uid_.console, | |
| 429 | 433 | out_); | |
| 430 | 434 | return true; | |
Lines changed: 3 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,30 +1,12 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | 2 | ||
| 3 | - // Refs: https://github.com/nodejs/node/issues/39272 | ||
| 4 | - | ||
| 5 | 3 | const common = require('../common'); | |
| 6 | 4 | ||
| 7 | - const assert = require('assert'); | ||
| 8 | - | ||
| 9 | - // When this is moved out of known_issues, this skip can be removed. | ||
| 10 | - if (common.isOSX) { | ||
| 11 | - assert.fail('does not fail reliably on macOS in CI'); | ||
| 12 | - } | ||
| 5 | + common.skipIfInspectorDisabled(); | ||
| 13 | 6 | ||
| 14 | - // When this is moved out of known_issues, this can be removed and replaced with | ||
| 15 | - // the commented-out use of common.skipIfInspectorDisabled() below. | ||
| 16 | - if (!process.features.inspector) { | ||
| 17 | - assert.fail('Known issues test should fail, so if the inspector is disabled'); | ||
| 18 | - } | ||
| 19 | - | ||
| 20 | - // Will need to uncomment this when moved out of known_issues. | ||
| 21 | - // common.skipIfInspectorDisabled(); | ||
| 7 | + const assert = require('assert'); | ||
| 22 | 8 | ||
| 23 | - // This can be reduced to 2 or even 1 (and the loop removed) once the debugger | ||
| 24 | - // is fixed. It's set higher to make sure that the error is tripped reliably | ||
| 25 | - // in CI. On most systems, the error will be tripped on the first test, but | ||
| 26 | - // on a few platforms in CI, it needs to be many times. | ||
| 27 | - const RESTARTS = 16; | ||
| 9 | + const RESTARTS = 10; | ||
| 28 | 10 | ||
| 29 | 11 | const fixtures = require('../common/fixtures'); | |
| 30 | 12 | const startCLI = require('../common/debugger'); | |
0 commit comments