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

This should fix the test's flakiness.

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

Author: derekxu16

pkg/vm_service/test/http_invocations/http_get_isolate_group_rpc_common.dart

@@ -11,7 +11,7 @@ import '../common/expect.dart';
 import '../common/service_test_common.dart';
 import 'http_request_helpers.dart';
 
-Future<String> getIsolateGroupId(
+Future<String> _getIsolateGroupId(
   Uri serverUri,
 ) async {
   final result = await makeHttpServiceRequest(
@@ -21,30 +21,26 @@ Future<String> getIsolateGroupId(
   return result['isolateGroups'][0]['id'] as String;
 }
 
-Future<void> testeeBefore() async {
-  final info = await waitForServiceInfo();
-  final serverUri = info.serverUri!;
-  try {
-    final result = createServiceObject(
-      await makeHttpServiceRequest(
-        serverUri: serverUri,
-        method: 'getIsolateGroup',
-        params: {'isolateGroupId': await getIsolateGroupId(serverUri)},
-      ),
-      ['IsolateGroup'],
-    )! as IsolateGroup;
-    Expect.isTrue(result.id!.startsWith('isolateGroups/'));
-    Expect.isNotNull(result.number);
-    Expect.isFalse(result.isSystemIsolateGroup);
-    Expect.isTrue(result.isolates!.isNotEmpty);
-  } catch (e) {
-    fail('invalid request: $e');
-  }
-}
+final httpGetIsolateGroupRpcTests = <IsolateTest>[
+  (VmService service, _) async {
+    final wsUri = Uri.parse(service.wsUri!);
+    final serverUri = Uri.parse('http://${wsUri.authority}');
 
-final tests = <IsolateTest>[
-  (VmService service, IsolateRef isolate) async {
-    // Just getting here means that the testee enabled the service protocol
-    // web server.
+    try {
+      final result = createServiceObject(
+        await makeHttpServiceRequest(
+          serverUri: serverUri,
+          method: 'getIsolateGroup',
+          params: {'isolateGroupId': await _getIsolateGroupId(serverUri)},
+        ),
+        ['IsolateGroup'],
+      )! as IsolateGroup;
+      Expect.isTrue(result.id!.startsWith('isolateGroups/'));
+      Expect.isNotNull(result.number);
+      Expect.isFalse(result.isSystemIsolateGroup);
+      Expect.isTrue(result.isolates!.isNotEmpty);
+    } catch (e) {
+      fail('invalid request: $e');
+    }
   }
 ];

pkg/vm_service/test/http_invocations/http_get_isolate_group_rpc_test.dart

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