From 9fa0f3b2ea28477fafdab8cfee5a677cd695a080 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 8 Nov 2019 14:38:44 -0800
Subject: [PATCH] fix test for null flutter root (#44468)

---
 .../flutter_tools/lib/src/commands/assemble.dart  | 15 ++++++++++-----
 .../commands.shard/hermetic/assemble_test.dart    |  6 ++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/assemble.dart b/packages/flutter_tools/lib/src/commands/assemble.dart
index ff92afca76e..b4758808fe4 100644
--- a/packages/flutter_tools/lib/src/commands/assemble.dart
+++ b/packages/flutter_tools/lib/src/commands/assemble.dart
@@ -87,11 +87,16 @@ class AssembleCommand extends FlutterCommand {
     if (futterProject == null) {
       return const <CustomDimensions, String>{};
     }
-    final Environment localEnvironment = environment;
-    return <CustomDimensions, String>{
-      CustomDimensions.commandBuildBundleTargetPlatform: localEnvironment.defines['TargetPlatform'],
-      CustomDimensions.commandBuildBundleIsModule: '${futterProject.isModule}',
-    };
+    try {
+      final Environment localEnvironment = environment;
+      return <CustomDimensions, String>{
+        CustomDimensions.commandBuildBundleTargetPlatform: localEnvironment.defines['TargetPlatform'],
+        CustomDimensions.commandBuildBundleIsModule: '${futterProject.isModule}',
+      };
+    } catch (err) {
+      // We've failed to send usage.
+    }
+    return const <CustomDimensions, String>{};
   }
 
   /// The target we are building.
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart
index 5d6e0c141f4..cb1dd10b755 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart
@@ -18,15 +18,13 @@ import '../../src/testbed.dart';
 void main() {
   Testbed testbed;
   MockBuildSystem mockBuildSystem;
-
-  setUpAll(() {
-    Cache.disableLocking();
-  });
+  Cache.disableLocking();
 
   setUp(() {
     mockBuildSystem = MockBuildSystem();
     testbed = Testbed(overrides: <Type, Generator>{
       BuildSystem: ()  => mockBuildSystem,
+      Cache: () => FakeCache(),
     });
   });