From d7f5547ecd036d80f408935e4dc154a0dbe0b8d8 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Thu, 21 Nov 2024 11:04:06 -0800
Subject: [PATCH] Do a clean shutdown of the flutter_tools processes started by
 observatory_port_test (#159169)

Killing the flutter_tools parent process may leak child processes
spawned by the tools.

Also wait for the message indicating that DevTools has started before
stopping flutter_tools. If DevTools has not fully launched, then there
may be a race between DevTools startup and flutter_tools shutdown.

Fixes https://github.com/flutter/flutter/issues/159154
---
 .../test/integration.shard/observatory_port_test.dart  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/flutter_tools/test/integration.shard/observatory_port_test.dart b/packages/flutter_tools/test/integration.shard/observatory_port_test.dart
index eb143e2f85b..1ae471f7270 100644
--- a/packages/flutter_tools/test/integration.shard/observatory_port_test.dart
+++ b/packages/flutter_tools/test/integration.shard/observatory_port_test.dart
@@ -26,7 +26,7 @@ Future<void> waitForVmServiceMessage(Process process, int port) async {
     .transform(utf8.decoder)
     .listen((String line) {
       printOnFailure(line);
-      if (line.contains('A Dart VM Service on Flutter test device is available at')) {
+      if (line.contains('The Flutter DevTools debugger and profiler on Flutter test device is available at')) {
         if (line.contains('http://127.0.0.1:$port')) {
           completer.complete();
         } else {
@@ -66,7 +66,9 @@ void main() {
       'flutter-tester',
     ], workingDirectory: tempDir.path);
     await waitForVmServiceMessage(process, port);
-    process.kill();
+    // Send a quit command to flutter_tools to cleanly shut down the tool
+    // and its child processes.
+    process.stdin.writeln('q');
     await process.exitCode;
   });
 
@@ -88,7 +90,7 @@ void main() {
       'flutter-tester',
     ], workingDirectory: tempDir.path);
     await waitForVmServiceMessage(process, ddsPort);
-    process.kill();
+    process.stdin.writeln('q');
     await process.exitCode;
   });
 
@@ -105,7 +107,7 @@ void main() {
       'flutter-tester',
     ], workingDirectory: tempDir.path);
     await waitForVmServiceMessage(process, ddsPort);
-    process.kill();
+    process.stdin.writeln('q');
     await process.exitCode;
   });