From b43722e79fabe23106e034555d9ebd472eadbcc3 Mon Sep 17 00:00:00 2001
From: Hixie <github.com@spam.hixie.ch>
Date: Mon, 2 Nov 2015 11:17:33 -0800
Subject: [PATCH] Handle crashing engine.

When the engine dies unexpectedly during test execution, we have to
terminate any tests running in that engine. Previously, they would just
hang. For some reason that I was never able to satisfactorily explain,
the WebSocket doesn't die in a way I can detect in this case. So
instead, we hand in a future that we only complete when we detect the
server subprocess ends.
---
 .../flutter_tools/lib/src/test/json_socket.dart    |  3 ++-
 packages/flutter_tools/lib/src/test/loader.dart    |  4 +++-
 .../flutter_tools/lib/src/test/remote_test.dart    | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_tools/lib/src/test/json_socket.dart b/packages/flutter_tools/lib/src/test/json_socket.dart
index 56ee44f61f1..8d29f0fd486 100644
--- a/packages/flutter_tools/lib/src/test/json_socket.dart
+++ b/packages/flutter_tools/lib/src/test/json_socket.dart
@@ -7,11 +7,12 @@ import 'dart:convert';
 import 'dart:io';
 
 class JSONSocket {
-  JSONSocket(WebSocket socket)
+  JSONSocket(WebSocket socket, this.unusualTermination)
     : _socket = socket, stream = socket.map(JSON.decode).asBroadcastStream();
 
   final WebSocket _socket;
   final Stream stream;
+  final Future unusualTermination;
 
   void send(dynamic data) {
     _socket.add(JSON.encode(data));
diff --git a/packages/flutter_tools/lib/src/test/loader.dart b/packages/flutter_tools/lib/src/test/loader.dart
index b649d911dda..635fc60e273 100644
--- a/packages/flutter_tools/lib/src/test/loader.dart
+++ b/packages/flutter_tools/lib/src/test/loader.dart
@@ -90,6 +90,7 @@ void main() {
 ''');
 
   Completer<Iterable<RemoteTest>> completer = new Completer<Iterable<RemoteTest>>();
+  Completer deathCompleter = new Completer();
 
   Process process = await _startProcess(
     listenerFile.path,
@@ -138,6 +139,7 @@ void main() {
         if (kExpectAllTestsToCloseCleanly && output != '')
           print('Unexpected failure after test claimed to pass:\n$output');
       }
+      deathCompleter.complete();
     } catch (e) {
       // Throwing inside this block causes all kinds of hard-to-debug issues
       // like stack overflows and hangs. So catch everything just in case.
@@ -145,7 +147,7 @@ void main() {
     }
   });
 
-  JSONSocket socket = new JSONSocket(await info.socket);
+  JSONSocket socket = new JSONSocket(await info.socket, deathCompleter.future);
 
   await cleanupTempDirectory();
 
diff --git a/packages/flutter_tools/lib/src/test/remote_test.dart b/packages/flutter_tools/lib/src/test/remote_test.dart
index 9c7b11cd699..261604ea1c6 100644
--- a/packages/flutter_tools/lib/src/test/remote_test.dart
+++ b/packages/flutter_tools/lib/src/test/remote_test.dart
@@ -4,6 +4,7 @@
 
 import 'dart:async';
 
+import 'package:stack_trace/stack_trace.dart';
 import 'package:test/src/backend/live_test.dart';
 import 'package:test/src/backend/live_test_controller.dart';
 import 'package:test/src/backend/metadata.dart';
@@ -29,8 +30,8 @@ class RemoteTest extends Test {
     StreamSubscription subscription;
 
     controller = new LiveTestController(suite, this, () async {
-      controller.setState(const State(Status.running, Result.success));
 
+      controller.setState(const State(Status.running, Result.success));
       _socket.send({'command': 'run', 'index': _index});
 
       subscription = _socket.stream.listen((message) {
@@ -51,6 +52,17 @@ class RemoteTest extends Test {
           controller.completer.complete();
         }
       });
+
+      _socket.unusualTermination.then((_) {
+        if (subscription != null) {
+          controller.addError(new Exception('Unexpected subprocess termination.'), new Trace.current());
+          controller.setState(new State(Status.complete, Result.error));
+          subscription.cancel();
+          subscription = null;
+          controller.completer.complete();
+        }
+      });
+
     }, () async {
       _socket.send({'command': 'close'});
       if (subscription != null) {