Run test tearDowns and clean up temporary directories when a signal is caught.

lib/src/runner/vm/isolate_test.dart

Index: lib/src/runner/vm/isolate_test.dart
diff --git a/lib/src/runner/vm/isolate_test.dart b/lib/src/runner/vm/isolate_test.dart
index ef73869f4a6a9d8e63d525d06a9f38814faa5dcb..7a97ce192e77ee383e28fe85cff8731318a65131 100644
--- a/lib/src/runner/vm/isolate_test.dart
+++ b/lib/src/runner/vm/isolate_test.dart
@@ -4,6 +4,7 @@
 
 library test.runner.vm.isolate_test;
 
+import 'dart:async';
 import 'dart:isolate';
 
 import '../../backend/live_test.dart';
@@ -26,11 +27,19 @@ class IsolateTest implements Test {
 
   /// Loads a single runnable instance of this test.
   LiveTest load(Suite suite) {
-    var receivePort;
     var controller;
+
+    // We get a new send port for communicating with the live test, since
+    // [_sendPort] is only for communicating with the non-live test. This will
+    // be non-null once the test starts running.
+    var sendPortCompleter;
+
+    var receivePort;
+    var closeCompleter = new Completer();

[kevmoo, 2015/04/03 00:49:45]

Is this used?

[nweiz, 2015/04/03 20:56:21]

Done.

     controller = new LiveTestController(suite, this, () {
       controller.setState(const State(Status.running, Result.success));
 
+      sendPortCompleter = new Completer();
       receivePort = new ReceivePort();
       _sendPort.send({
         'command': 'run',
@@ -38,7 +47,9 @@ class IsolateTest implements Test {
       });
 
       receivePort.listen((message) {
-        if (message['type'] == 'error') {
+        if (message['type'] == 'started') {
+          sendPortCompleter.complete(message['reply']);
+        } else if (message['type'] == 'error') {
           var asyncError = RemoteException.deserialize(message['error']);
           controller.addError(asyncError.error, asyncError.stackTrace);
         } else if (message['type'] == 'state-change') {
@@ -53,8 +64,21 @@ class IsolateTest implements Test {
           controller.completer.complete();
         }
       });
-    }, onClose: () {
-      if (receivePort != null) receivePort.close();
+    }, () {
+      // If the test has finished running, just disconnect the receive port. The
+      // Dart process won't terminate if there are any live receive ports open.
+      if (controller.completer.isCompleted) {
+        receivePort.close();
+        return;
+      }
+
+      // If the test is still running, send it a message telling it to shut down
+      // ASAP. This causes the [Invoker] to eagerly throw exceptions whenever
+      // the test touches it.
+      sendPortCompleter.future.then((sendPort) {
+        sendPort.send({'command': 'close'});
+        return controller.completer.future;
+      }).then((_) => receivePort.close());
     });
     return controller.liveTest;
   }