Run service tests in a zone that gracefully handles websocket disconnections

runtime/observatory/tests/service/test_helper.dart

 // Copyright (c) 2013, 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 --checked
 
 library test_helper;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:observatory/service_io.dart';
 
+bool _isWebSocketDisconnect(e) {
+  if (e is! ServiceException) {
+    return false;
+  }
+  return (e as ServiceException).message == 'WebSocket disconnected';
+}
+
 // This invocation should set up the state being tested.
 const String _TESTEE_MODE_FLAG = "--testee-mode";
 
 class _TestLauncher {
   Process process;
   final List<String> args;
 
   _TestLauncher() : args = ['--enable-vm-service:0',
                             Platform.script.toFilePath(),
                             _TESTEE_MODE_FLAG] {}
@@ skipping 72 matching lines @@
     }
     // Wait around for the process to be killed.
     stdin.first.then((_) => exit(0));
   } else {
     var process = new _TestLauncher();
     process.launch(pause_on_exit).then((port) {
       String addr = 'ws://localhost:$port/ws';
       var testIndex = 0;
       var totalTests = tests.length - 1;
       var name = Platform.script.pathSegments.last;
-      new WebSocketVM(new WebSocketVMTarget(addr)).load()
-          .then((VM vm) => vm.isolates.first.load())
-          .then((Isolate isolate) => Future.forEach(tests, (test) {
-            print('Running $name [$testIndex/$totalTests]');
-            testIndex++;
-            return test(isolate);
-          })).then((_) => process.requestExit());
+      runZoned(() {
+        new WebSocketVM(new WebSocketVMTarget(addr)).load()
+            .then((VM vm) => vm.isolates.first.load())
+            .then((Isolate isolate) => Future.forEach(tests, (test) {
+              print('Running $name [$testIndex/$totalTests]');
+              testIndex++;
+              return test(isolate);
+            })).then((_) => process.requestExit());
+      }, onError: (e, st) {
+        if (!_isWebSocketDisconnect(e)) {
+          print('Unexpected exception in service tests: $e $st');
+          throw e;
+        }
+      });
     });
   }
 }
 
 
 // Cancel the subscription and complete the completer when finished processing
 // events.
 typedef void ServiceEventHandler(ServiceEvent event,
                                  StreamSubscription subscription,
                                  Completer completer);
@@ skipping 27 matching lines @@
     }
     // Wait around for the process to be killed.
     stdin.first.then((_) => exit(0));
   } else {
     var process = new _TestLauncher();
     process.launch(pause_on_exit).then((port) async {
       String addr = 'ws://localhost:$port/ws';
       var testIndex = 0;
       var totalTests = tests.length - 1;
       var name = Platform.script.pathSegments.last;
-      new WebSocketVM(new WebSocketVMTarget(addr)).load()
-          .then((VM vm) => Future.forEach(tests, (test) {
-            print('Running $name [$testIndex/$totalTests]');
-            testIndex++;
-            return test(vm);
-          })).then((_) => process.requestExit());
+      runZoned(() {
+        new WebSocketVM(new WebSocketVMTarget(addr)).load()
+            .then((VM vm) => Future.forEach(tests, (test) {
+              print('Running $name [$testIndex/$totalTests]');
+              testIndex++;
+              return test(vm);
+            })).then((_) => process.requestExit());
+      }, onError: (e, st) {
+        if (!_isWebSocketDisconnect(e)) {
+          print('Unexpected exception in service tests: $e $st');
+          throw e;
+        }
+      });
     });
   }
 }