[ DDS ] Fix failing tests

Fixes failing tests introduced by https://dart-review.googlesource.com/c/sdk/+/383780. Change-Id: I700543f4dc6481dd905ffdc44177b009612565d6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384880 Auto-Submit: Ben Konyi <[email protected]> Commit-Queue: Ben Konyi <[email protected]> Reviewed-by: Derek Xu <[email protected]>
dart-lang · Sep 11, 2024 · a5cd16c · a5cd16c
1 parent 6f1887a
commit a5cd16c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart b/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart
@@ -111,6 +111,7 @@ class DartCliDebugAdapter extends DartDebugAdapter<DartLaunchRequestArguments,
         if (!enableAuthCodes) '--disable-service-auth-codes'
       ],
       '--disable-dart-dev',
+      '--no-dds',
       if (debug && vmServiceInfoFile != null) ...[
         '-DSILENT_VM_SERVICE=true',
         '--write-service-info=${Uri.file(vmServiceInfoFile.path)}'

diff --git a/pkg/dds/test/dap_handler_test.dart b/pkg/dds/test/dap_handler_test.dart
@@ -15,6 +15,19 @@ import 'package:vm_service/vm_service_io.dart';
 
 import 'common/test_helper.dart';
 
+Future<Isolate> waitForFirstRunnableIsolate(VmService service) async {
+  VM vm;
+  do {
+    vm = await service.getVM();
+  } while (vm.isolates!.isEmpty);
+  final isolateId = vm.isolates!.first.id!;
+  Isolate isolate;
+  do {
+    isolate = await service.getIsolate(isolateId);
+  } while (!isolate.runnable!);
+  return isolate;
+}
+
 void main() {
   Process? process;
   DartDevelopmentService? dds;
@@ -116,18 +129,10 @@ void main() {
     );
     service = await vmServiceConnectUri(dds!.wsUri!.toString());
 
-    final isolateRef = (await service.getVM()).isolates!.first;
-    final isolateId = isolateRef.id!;
-
     // Wait for the isolate to become runnable as `evaluateInFrame` requires
     // the isolate to be runnable.
-    Isolate? isolate;
-    do {
-      if (isolate != null) {
-        await Future.delayed(const Duration(milliseconds: 50));
-      }
-      isolate = await service.getIsolate(isolateId);
-    } while (!isolate.runnable!);
+    final isolate = await waitForFirstRunnableIsolate(service);
+    final isolateId = isolate.id!;
 
     // Get the variable for 'myInstance'.
     final originalInstanceRef = (await service.evaluateInFrame(
@@ -173,7 +178,8 @@ void main() {
     service = await vmServiceConnectUri(dds!.wsUri!.toString());
 
     // Get the expected isolateId.
-    final isolateId = (await service.getVM()).isolates!.first.id!;
+    final isolate = await waitForFirstRunnableIsolate(service);
+    final isolateId = isolate.id!;
 
     // Ask DAP for all threads.
     final threadsResult = await sendDapRequest(Command.threads);

diff --git a/pkg/dds/test/external_compilation_service_test.dart b/pkg/dds/test/external_compilation_service_test.dart
@@ -2,13 +2,28 @@
 // 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 'dart:io';
 
 import 'package:dds/dds.dart';
 import 'package:test/test.dart';
+import 'package:vm_service/vm_service.dart';
 import 'package:vm_service/vm_service_io.dart';
 import 'common/test_helper.dart';
 
+Future<Isolate> waitForFirstRunnableIsolate(VmService service) async {
+  VM vm;
+  do {
+    vm = await service.getVM();
+  } while (vm.isolates!.isEmpty);
+  final isolateId = vm.isolates!.first.id!;
+  Isolate isolate;
+  do {
+    isolate = await service.getIsolate(isolateId);
+  } while (!isolate.runnable!);
+  return isolate;
+}
+
 void main() {
   group('DDS', () {
     late Process process;
@@ -39,8 +54,7 @@ void main() {
         invokedCompileExpression = true;
         throw 'error';
       });
-      final vm = await service.getVM();
-      final isolate = await service.getIsolate(vm.isolates!.first.id!);
+      final isolate = await waitForFirstRunnableIsolate(service);
       try {
         await service.evaluate(
             isolate.id!, isolate.libraries!.first.id!, '1 + 1');
@@ -66,14 +80,11 @@ void main() {
         invokedCompileExpression = true;
         throw 'error';
       });
-      final vm = await service.getVM();
-      final isolate = await service.getIsolate(vm.isolates!.first.id!);
+      final isolate = await waitForFirstRunnableIsolate(service);
       await service.resume(isolate.id!);
       try {
         await service.evaluateInFrame(isolate.id!, 0, '1 + 1');
-      } catch (e, st) {
-        print(e);
-        print(st);
+      } catch (_) {
         // ignore error
       }
       expect(invokedCompileExpression, true);