[VM/Service] Move test logic of http_get_vm_rpc_test from testee to main process

This should fix the tests' flakiness.

Change-Id: I613e6c21babda6254579b4dc24f7d1da7647e619
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419640
Reviewed-by: Ben Konyi <[email protected]>

Author: derekxu16

pkg/vm_service/test/http_invocations/http_auth_get_vm_rpc_test.dart

@@ -7,7 +7,6 @@ import 'http_get_vm_rpc_common.dart';
 
 void main([args = const <String>[]]) => runIsolateTests(
       args,
-      tests,
+      httpGetVmRpcTests,
       'http_auth_get_vm_rpc_test.dart',
-      testeeBefore: testeeBefore,
     );

pkg/vm_service/test/http_invocations/http_get_vm_rpc_common.dart

@@ -2,43 +2,36 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:vm_service/vm_service.dart';
 
 import '../common/expect.dart';
 import '../common/service_test_common.dart';
 import 'http_request_helpers.dart';
 
-Future<void> testeeBefore() async {
-  final info = await waitForServiceInfo();
-  final serverUri = info.serverUri!;
-
-  try {
-    final result = createServiceObject(
-      await makeHttpServiceRequest(
-        serverUri: serverUri,
-        method: 'getVM',
-      ),
-      ['VM'],
-    )! as VM;
-    Expect.equals(result.name, 'vm');
-    Expect.isTrue(result.architectureBits! > 0);
-    Expect.isNotNull(result.targetCPU);
-    Expect.isNotNull(result.hostCPU);
-    Expect.isNotNull(result.version);
-    Expect.isNotNull(result.pid);
-    Expect.isTrue(result.startTime! > 0);
-    Expect.isTrue(result.isolates!.isNotEmpty);
-    Expect.isTrue(result.isolateGroups!.isNotEmpty);
-  } catch (e) {
-    Expect.fail('invalid request: $e');
-  }
-}
+final httpGetVmRpcTests = <IsolateTest>[
+  (VmService service, _) async {
+    final wsUri = Uri.parse(service.wsUri!);
+    final serverUri = Uri.parse('http://${wsUri.authority}');
 
-final tests = <IsolateTest>[
-  (VmService service, IsolateRef isolateRef) async {
-    // Just getting here means that the testee enabled the service protocol
-    // web server.
+    try {
+      final result = createServiceObject(
+        await makeHttpServiceRequest(
+          serverUri: serverUri,
+          method: 'getVM',
+        ),
+        ['VM'],
+      )! as VM;
+      Expect.equals(result.name, 'vm');
+      Expect.isTrue(result.architectureBits! > 0);
+      Expect.isNotNull(result.targetCPU);
+      Expect.isNotNull(result.hostCPU);
+      Expect.isNotNull(result.version);
+      Expect.isNotNull(result.pid);
+      Expect.isTrue(result.startTime! > 0);
+      Expect.isTrue(result.isolates!.isNotEmpty);
+      Expect.isTrue(result.isolateGroups!.isNotEmpty);
+    } catch (e) {
+      Expect.fail('invalid request: $e');
+    }
   }
 ];

pkg/vm_service/test/http_invocations/http_get_vm_rpc_test.dart

@@ -7,8 +7,7 @@ import 'http_get_vm_rpc_common.dart';
 
 void main([args = const <String>[]]) => runIsolateTests(
       args,
-      tests,
+      httpGetVmRpcTests,
       'http_get_vm_rpc_test.dart',
-      testeeBefore: testeeBefore,
       useAuthToken: false,
     );