commit ad72c7834231244f731e3c1ef12f40232b9fb97e
author P.Y. Laligand <py.laligand@gmail.com> Mon Oct 16 10:58:39 2017 -0700
committer GitHub <noreply@github.com> Mon Oct 16 10:58:39 2017 -0700
tree 63748de0d564788ac414f68ba731769ac7536465
parent fea1129921f1f656208dee2cae1f7f940a793cf7

Fix testing on Fuchsia. (#12563)

packages/flutter_tools/bin/fuchsia_builder.dart

diff --git a/packages/flutter_tools/bin/fuchsia_builder.dart b/packages/flutter_tools/bin/fuchsia_builder.dart
index 43a8299..1c23fb2 100644
--- a/packages/flutter_tools/bin/fuchsia_builder.dart
+++ b/packages/flutter_tools/bin/fuchsia_builder.dart
@@ -44,16 +44,17 @@
   executableContext.setVariable(Logger, new StdoutLogger());
   await executableContext.runInZone(() {
     // Initialize the context with some defaults.
+    // This list must be kept in sync with lib/executable.dart.
     context.putIfAbsent(Stdio, () => const Stdio());
     context.putIfAbsent(Platform, () => const LocalPlatform());
     context.putIfAbsent(FileSystem, () => const LocalFileSystem());
     context.putIfAbsent(ProcessManager, () => const LocalProcessManager());
+    context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal());
     context.putIfAbsent(Logger, () => new StdoutLogger());
     context.putIfAbsent(Cache, () => new Cache());
     context.putIfAbsent(Config, () => new Config());
     context.putIfAbsent(OperatingSystemUtils, () => new OperatingSystemUtils());
     context.putIfAbsent(Usage, () => new Usage());
-    context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal());
     return run(args);
   });
 }

packages/flutter_tools/bin/fuchsia_tester.dart

diff --git a/packages/flutter_tools/bin/fuchsia_tester.dart b/packages/flutter_tools/bin/fuchsia_tester.dart
index d357834..8c6892e 100644
--- a/packages/flutter_tools/bin/fuchsia_tester.dart
+++ b/packages/flutter_tools/bin/fuchsia_tester.dart
@@ -40,15 +40,17 @@
   executableContext.setVariable(Logger, new StdoutLogger());
   await executableContext.runInZone(() {
     // Initialize the context with some defaults.
+    // This list must be kept in sync with lib/executable.dart.
+    context.putIfAbsent(Stdio, () => const Stdio());
     context.putIfAbsent(Platform, () => const LocalPlatform());
     context.putIfAbsent(FileSystem, () => const LocalFileSystem());
     context.putIfAbsent(ProcessManager, () => const LocalProcessManager());
+    context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal());
     context.putIfAbsent(Logger, () => new StdoutLogger());
     context.putIfAbsent(Cache, () => new Cache());
     context.putIfAbsent(Config, () => new Config());
     context.putIfAbsent(OperatingSystemUtils, () => new OperatingSystemUtils());
     context.putIfAbsent(Usage, () => new Usage());
-    context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal());
     return run(args);
   });
 }