From d71ecd85d9df5434cd8a575d9f4e641fb8d689df Mon Sep 17 00:00:00 2001 From: "whesse@google.com" Date: Thu, 6 Nov 2014 13:03:00 +0000 Subject: [PATCH] Fix hanging test script batch runners. BUG= R=ricow@google.com Review URL: https://codereview.chromium.org//707733003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@41553 260f80e4-7a28-3924-810f-c04153c831b5 --- tools/testing/dart/test_runner.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart index 23c37b2a60c..8b1cc55887b 100644 --- a/tools/testing/dart/test_runner.dart +++ b/tools/testing/dart/test_runner.dart @@ -1964,6 +1964,8 @@ class BatchRunnerProcess { }); }; _process.kill(); + _stdoutSubscription.cancel(); + _stderrSubscription.cancel(); } else { doStartTest(command, timeout); } @@ -1973,12 +1975,12 @@ class BatchRunnerProcess { Future terminate() { if (_process == null) return new Future.value(true); Completer terminateCompleter = new Completer(); - Timer killTimer; _processExitHandler = (_) { - if (killTimer != null) killTimer.cancel(); terminateCompleter.complete(true); }; _process.kill(); + _stdoutSubscription.cancel(); + _stderrSubscription.cancel(); return terminateCompleter.future; }