From 417449e2f3aae87d9c009769e4c508bbdf76ea9c Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Wed, 30 Oct 2019 13:09:26 -0700
Subject: [PATCH] Deflake flutter tool logger test (#43800)

---
 packages/flutter_tools/lib/src/base/logger.dart           | 8 ++++----
 .../test/general.shard/base/logger_test.dart              | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/flutter_tools/lib/src/base/logger.dart b/packages/flutter_tools/lib/src/base/logger.dart
index 1104cd71472..25daa42da19 100644
--- a/packages/flutter_tools/lib/src/base/logger.dart
+++ b/packages/flutter_tools/lib/src/base/logger.dart
@@ -359,12 +359,12 @@ class BufferLogger extends Logger {
 
 class VerboseLogger extends Logger {
   VerboseLogger(this.parent) : assert(terminal != null) {
-    stopwatch.start();
+    _stopwatch.start();
   }
 
   final Logger parent;
 
-  Stopwatch stopwatch = Stopwatch();
+  final Stopwatch _stopwatch = context.get<Stopwatch>() ?? Stopwatch();
 
   @override
   bool get isVerbose => true;
@@ -438,8 +438,8 @@ class VerboseLogger extends Logger {
       return;
     }
 
-    final int millis = stopwatch.elapsedMilliseconds;
-    stopwatch.reset();
+    final int millis = _stopwatch.elapsedMilliseconds;
+    _stopwatch.reset();
 
     String prefix;
     const int prefixWidth = 8;
diff --git a/packages/flutter_tools/test/general.shard/base/logger_test.dart b/packages/flutter_tools/test/general.shard/base/logger_test.dart
index 4f90fb176f6..f9ab865d696 100644
--- a/packages/flutter_tools/test/general.shard/base/logger_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/logger_test.dart
@@ -24,6 +24,11 @@ void main() {
   final String resetColor = RegExp.escape(AnsiTerminal.resetColor);
 
   group('AppContext', () {
+    FakeStopwatch fakeStopWatch;
+
+    setUp(() {
+      fakeStopWatch = FakeStopwatch();
+    });
     testUsingContext('error', () async {
       final BufferLogger mockLogger = BufferLogger();
       final VerboseLogger verboseLogger = VerboseLogger(mockLogger);
@@ -39,6 +44,7 @@ void main() {
     }, overrides: <Type, Generator>{
       OutputPreferences: () => OutputPreferences(showColor: false),
       Platform: _kNoAnsiPlatform,
+      Stopwatch: () => fakeStopWatch,
     });
 
     testUsingContext('ANSI colored errors', () async {
@@ -60,6 +66,7 @@ void main() {
     }, overrides: <Type, Generator>{
       OutputPreferences: () => OutputPreferences(showColor: true),
       Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
+      Stopwatch: () => fakeStopWatch,
     });
   });