Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: tools/testing/dart/test_runner.dart

Issue 707733003: Fix hanging test script batch runners. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/test_runner.dart
diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
index 23c37b2a60ca6cf28ef51ae97476e3c28286ce5d..8b1cc55887bdbf40eaaffdc968f0e81169496c45 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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698