Make VM event streams look like real dart streams.

runtime/observatory/tests/service/code_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // 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.
 // VMOptions=--compile-all --error_on_bad_type --error_on_bad_override
 
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
 import 'test_helper.dart';
 import 'dart:async';
 
@@ skipping 16 matching lines @@
   }
 }
 
 var tests = [
 
 // Go to breakpoint at line 13.
 (Isolate isolate) {
   return isolate.rootLibrary.load().then((_) {
       // Set up a listener to wait for breakpoint events.
       Completer completer = new Completer();
-      isolate.vm.events.stream.listen((ServiceEvent event) {
-        if (event.kind == ServiceEvent.kPauseBreakpoint) {
-          print('Breakpoint reached');
-          completer.complete();
-        }
+      isolate.vm.getDebugEventStream().then((stream) {

[Cutch, 2015/07/07 23:16:09]

Replace with:

await isolate.addBreakpoint(script, line);
await hasStoppedAtBreakpoint(isolate);

?

[turnidge, 2015/07/08 20:23:39]

My preference is to modify the tests as little as possible and allow test
cleanup/refactoring to go in a different cl.

+        var subscription;
+        subscription = stream.listen((ServiceEvent event) {
+          if (event.kind == ServiceEvent.kPauseBreakpoint) {
+            print('Breakpoint reached');
+            subscription.cancel();
+            completer.complete();
+          }
+        });
       });
 
       // Add the breakpoint.
       var script = isolate.rootLibrary.scripts[0];
       var line = 13;
       return isolate.addBreakpoint(script, line).then((ServiceObject bpt) {
           return completer.future;  // Wait for breakpoint reached.
       });
     });
 },
@@ skipping 25 matching lines @@
             expect(code.function.name, equals('funcA'));
             expect(code.hasDisassembly, equals(true));
           }));
       return Future.wait(tests);
   });
 },
 
 ];
 
 main(args) => runIsolateTests(args, tests, testeeConcurrent: testFunction);