From fce4cc3d39cfb6764b7520f45f25ec4e12f603ec Mon Sep 17 00:00:00 2001
From: Yegor <yjbanov@google.com>
Date: Thu, 1 Jul 2021 13:08:49 -0700
Subject: [PATCH] [web] collect macOS info only on bot; propagate errors
 (flutter/engine#27089)

---
 .../flutter/lib/web_ui/dev/macos_info.dart    | 25 +++++--------------
 .../flutter/lib/web_ui/dev/test_runner.dart   |  4 +--
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/engine/src/flutter/lib/web_ui/dev/macos_info.dart b/engine/src/flutter/lib/web_ui/dev/macos_info.dart
index 9d77c2d9dfb..33ab087a868 100644
--- a/engine/src/flutter/lib/web_ui/dev/macos_info.dart
+++ b/engine/src/flutter/lib/web_ui/dev/macos_info.dart
@@ -11,23 +11,9 @@ class MacOSInfo {
   ///
   /// Built in tools such as `system_profiler` and `defaults` are utilized.
   Future<void> printInformation() async {
-    try {
-      await _printSafariApplications();
-    } catch (error) {
-      print('Error thrown while getting Safari Applications: $error');
-    }
-
-    try {
-      await _printSafariDefaults();
-    } catch (error) {
-      print('Error thrown while getting Safari defaults: $error');
-    }
-
-    try {
-      await _printUserLimits();
-    } catch (error) {
-      print('Error thrown while getting user limits defaults: $error');
-    }
+    await _printSafariApplications();
+    await _printSafariDefaults();
+    await _printUserLimits();
   }
 
   /// Print information on applications in the system that contains string
@@ -59,17 +45,18 @@ class MacOSInfo {
     final ProcessManager defaults = await startProcess(
       '/usr/bin/defaults',
       ['find', 'Safari'],
+      evalOutput: true,
     );
     print('Safari related defaults:\n ${await defaults.evalStdout()}');
   }
 
   /// Print user limits (file and process).
   Future<void> _printUserLimits() async {
-    ProcessManager ulimit = await startProcess('ulimit', ['-n']);
+    ProcessManager ulimit = await startProcess('ulimit', ['-n'], evalOutput: true);
     final String fileLimit = await ulimit.evalStdout();
     print('MacOS file limit: $fileLimit');
 
-    ulimit = await startProcess('ulimit', ['-u']);
+    ulimit = await startProcess('ulimit', ['-u'], evalOutput: true);
     final String processLimit = await ulimit.evalStdout();
     print('MacOS process limit: $processLimit');
   }
diff --git a/engine/src/flutter/lib/web_ui/dev/test_runner.dart b/engine/src/flutter/lib/web_ui/dev/test_runner.dart
index c2300fb1c7d..f1edb7ee50d 100644
--- a/engine/src/flutter/lib/web_ui/dev/test_runner.dart
+++ b/engine/src/flutter/lib/web_ui/dev/test_runner.dart
@@ -187,8 +187,8 @@ class TestCommand extends Command<bool> with ArgUtils {
       ..argParsers.forEach((t) => t.parseOptions(argResults!));
     GeneralTestsArgumentParser.instance.parseOptions(argResults!);
 
-    if (isSafariOnMacOS) {
-      /// Collect information on the bot.
+    /// Collect information on the bot.
+    if (isSafariOnMacOS && isLuci) {
       final MacOSInfo macOsInfo = new MacOSInfo();
       await macOsInfo.printInformation();
     }