Attempt to fix race in microbenchmark error handling code (#19092)

Await stream cancellations before trying to complete

Attempt to fix race in microbenchmark error handling code (#19092)
Await stream cancellations before trying to complete
e1d396d5 · Danny Tuppeny · GitHub · c34daae2 · e1d396d5
Unverified Commit e1d396d5 authored Jul 05, 2018 by Danny Tuppeny Committed by GitHub Jul 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

microbenchmarks.dart dev/devicelab/lib/tasks/microbenchmarks.dart +5 -3

No files found.
--- a/dev/devicelab/lib/tasks/microbenchmarks.dart
+++ b/dev/devicelab/lib/tasks/microbenchmarks.dart
@@ -139,9 +139,11 @@ Future<Map<String, double>> _readJsonResults(Process process) {
      jsonBuf.writeln(line.substring(line.indexOf(jsonPrefix) + jsonPrefix.length));
  });
-  process.exitCode.then<int>((int code) {
+  process.exitCode.then<int>((int code) async {
-    stdoutSub.cancel();
+    await Future.wait<void>(<Future<void>>[
-    stderrSub.cancel();
+      stdoutSub.cancel(),
+      stderrSub.cancel(),
+    ]);
    if (!processWasKilledIntentionally && code != 0) {
      completer.completeError('flutter run failed: exit code=$code');
    }