[flutter_tools] fix port leak in flutter_driver (#70999)

packages/flutter_driver/lib/src/driver/vmservice_driver.dart

@@ -530,7 +530,6 @@ class VMServiceFlutterDriver extends FlutterDriver {
   }
 }
 
-
 /// The connection function used by [FlutterDriver.connect].
 ///
 /// Overwrite this function if you require a custom method for connecting to
@@ -563,13 +562,18 @@ Future<vms.VmService> _waitAndConnect(String url, Map<String, dynamic> headers)
   while (true) {
     try {
       socket = await WebSocket.connect(webSocketUrl, headers: headers);
+      final StreamController<dynamic> controller = StreamController<dynamic>();
+      final Completer<void> streamClosedCompleter = Completer<void>();
+      socket.listen(
+        (dynamic data) => controller.add(data),
+        onDone: () => streamClosedCompleter.complete(),
+      );
       final vms.VmService service = vms.VmService(
-        socket,
+        controller.stream,
         socket.add,
         log: null,
-        disposeHandler: () async {
-          await socket.close();
-        },
+        disposeHandler: () => socket.close(),
+        streamClosed: streamClosedCompleter.future
       );
       // This call is to ensure we are able to establish a connection instead of
       // keeping on trucking and failing farther down the process.
@@ -586,7 +590,6 @@ Future<vms.VmService> _waitAndConnect(String url, Map<String, dynamic> headers)
   }
 }
 
-
 /// The amount of time we wait prior to making the next attempt to connect to
 /// the VM service.
 const Duration _kPauseBetweenReconnectAttempts = Duration(seconds: 1);

packages/flutter_tools/lib/src/drive/drive_service.dart

@@ -235,16 +235,9 @@ class FlutterDriverService extends DriverService {
     int driverPort,
     List<String> browserDimension,
   }) async {
-    // Check if package:test is available. If not, fall back to invoking
-    // the test script directly. `pub run test` is strictly better because
-    // in the even that a socket or something similar is left open, the
-    // test runner will correctly shutdown the VM instead of hanging forever.
     return _processUtils.stream(<String>[
       _dartSdkPath,
-      if (packageConfig['test'] != null)
-        ...<String>['pub', 'run', 'test', ...arguments, testFile, '-rexpanded']
-      else
-        ...<String>[...arguments, testFile, '-rexpanded'],
+      ...<String>[...arguments, testFile, '-rexpanded'],
     ], environment: <String, String>{
       'VM_SERVICE_URL': _vmServiceUri,
       ...environment,

packages/flutter_tools/test/general.shard/drive/drive_service_test.dart

@@ -153,7 +153,7 @@ void main() {
     ]);
     final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
       const FakeCommand(
-        command: <String>['dart', 'pub', 'run', 'test', '--enable-experiment=non-nullable', 'foo.test', '-rexpanded'],
+        command: <String>['dart', '--enable-experiment=non-nullable', 'foo.test', '-rexpanded'],
         exitCode: 23,
         environment: <String, String>{
           'FOO': 'BAR',
@@ -214,7 +214,7 @@ void main() {
     ]);
     final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
       const FakeCommand(
-        command: <String>['dart', 'pub', 'run', 'test', 'foo.test', '-rexpanded'],
+        command: <String>['dart', 'foo.test', '-rexpanded'],
         exitCode: 11,
         environment: <String, String>{
           'VM_SERVICE_URL': 'http://127.0.0.1:1234/'