| Index: runtime/observatory/tests/service/test_helper.dart
|
| diff --git a/runtime/observatory/tests/service/test_helper.dart b/runtime/observatory/tests/service/test_helper.dart
|
| index c742b2303e895f5573d797cd71a8c51f39916bf3..e22cbb2fbee0879d16b4ed2ce86da2edf23e032e 100644
|
| --- a/runtime/observatory/tests/service/test_helper.dart
|
| +++ b/runtime/observatory/tests/service/test_helper.dart
|
| @@ -275,37 +275,39 @@ class _ServiceTesterRunner {
|
| serviceWebsocketAddress = 'ws://localhost:$port/ws';
|
| serviceHttpAddress = 'http://localhost:$port';
|
| var name = Platform.script.pathSegments.last;
|
| - runZoned(() {
|
| - new WebSocketVM(new WebSocketVMTarget(serviceWebsocketAddress)).load()
|
| - .then((VM vm) async {
|
| -
|
| - // Run vm tests.
|
| - if (vmTests != null) {
|
| - var testIndex = 1;
|
| - var totalTests = vmTests.length;
|
| - for (var test in vmTests) {
|
| - vm.verbose = verbose_vm;
|
| - print('Running $name [$testIndex/$totalTests]');
|
| - testIndex++;
|
| - await test(vm);
|
| - }
|
| - }
|
| -
|
| - // Run isolate tests.
|
| - if (isolateTests != null) {
|
| - var isolate = await vm.isolates.first.load();
|
| - var testIndex = 1;
|
| - var totalTests = isolateTests.length;
|
| - for (var test in isolateTests) {
|
| - vm.verbose = verbose_vm;
|
| - print('Running $name [$testIndex/$totalTests]');
|
| - testIndex++;
|
| - await test(isolate);
|
| - }
|
| - }
|
| -
|
| - await process.requestExit();
|
| - });
|
| + runZoned(() async {
|
| + var vm =
|
| + new WebSocketVM(new WebSocketVMTarget(serviceWebsocketAddress));
|
| + print('Loading VM...');
|
| + await vm.load();
|
| + print('Done loading VM');
|
| +
|
| + // Run vm tests.
|
| + if (vmTests != null) {
|
| + var testIndex = 1;
|
| + var totalTests = vmTests.length;
|
| + for (var test in vmTests) {
|
| + vm.verbose = verbose_vm;
|
| + print('Running $name [$testIndex/$totalTests]');
|
| + testIndex++;
|
| + await test(vm);
|
| + }
|
| + }
|
| +
|
| + // Run isolate tests.
|
| + if (isolateTests != null) {
|
| + var isolate = await vm.isolates.first.load();
|
| + var testIndex = 1;
|
| + var totalTests = isolateTests.length;
|
| + for (var test in isolateTests) {
|
| + vm.verbose = verbose_vm;
|
| + print('Running $name [$testIndex/$totalTests]');
|
| + testIndex++;
|
| + await test(isolate);
|
| + }
|
| + }
|
| +
|
| + await process.requestExit();
|
| }, onError: (e, st) {
|
| process.requestExit();
|
| if (!_isWebSocketDisconnect(e)) {
|
|
|