From 90705851de94e0623be9d27913f0619897942707 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 9 Jul 2021 18:19:41 -0700
Subject: [PATCH] debugger: do not repeat connection message when disconnecting

Fixes: https://github.com/nodejs/node/issues/39272
---
 src/inspector_socket_server.cc                |  8 -------
 .../test-debugger-restart-message.js          | 24 +++----------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 rename test/{known_issues => sequential}/test-debugger-restart-message.js (50%)

diff --git a/src/inspector_socket_server.cc b/src/inspector_socket_server.cc
index 29e0c128026ed0..81b01d4b8ea9f1 100644
--- a/src/inspector_socket_server.cc
+++ b/src/inspector_socket_server.cc
@@ -295,14 +295,6 @@ void InspectorSocketServer::SessionTerminated(int session_id) {
   }
   connected_sessions_.erase(session_id);
   if (connected_sessions_.empty()) {
-    if (was_attached && state_ == ServerState::kRunning
-        && !server_sockets_.empty()) {
-      PrintDebuggerReadyMessage(host_,
-                                server_sockets_,
-                                delegate_->GetTargetIds(),
-                                inspect_publish_uid_.console,
-                                out_);
-    }
     if (state_ == ServerState::kStopped) {
       delegate_.reset();
     }
diff --git a/test/known_issues/test-debugger-restart-message.js b/test/sequential/test-debugger-restart-message.js
similarity index 50%
rename from test/known_issues/test-debugger-restart-message.js
rename to test/sequential/test-debugger-restart-message.js
index 478806effbb39c..bcd06b4e230131 100644
--- a/test/known_issues/test-debugger-restart-message.js
+++ b/test/sequential/test-debugger-restart-message.js
@@ -1,30 +1,12 @@
 'use strict';
 
-// Refs: https://github.com/nodejs/node/issues/39272
-
 const common = require('../common');
 
-const assert = require('assert');
-
-// When this is moved out of known_issues, this skip can be removed.
-if (common.isOSX) {
-  assert.fail('does not fail reliably on macOS in CI');
-}
+common.skipIfInspectorDisabled();
 
-// When this is moved out of known_issues, this can be removed and replaced with
-// the commented-out use of common.skipIfInspectorDisabled() below.
-if (!process.features.inspector) {
-  assert.fail('Known issues test should fail, so if the inspector is disabled');
-}
-
-// Will need to uncomment this when moved out of known_issues.
-// common.skipIfInspectorDisabled();
+const assert = require('assert');
 
-// This can be reduced to 2 or even 1 (and the loop removed) once the debugger
-// is fixed. It's set higher to make sure that the error is tripped reliably
-// in CI. On most systems, the error will be tripped on the first test, but
-// on a few platforms in CI, it needs to be many times.
-const RESTARTS = 16;
+const RESTARTS = 10;
 
 const fixtures = require('../common/fixtures');
 const startCLI = require('../common/debugger');