From 9e0ba9a97eb8c88310504ce9f7b2903d7ee1f160 Mon Sep 17 00:00:00 2001
From: Andrew Brogdon <RedBrogdon@users.noreply.github.com>
Date: Tue, 29 Jun 2021 17:22:37 -0700
Subject: [PATCH] Unbreaking beta and dev tests (#839)

---
 tool/android_ci_script.sh        |  2 ++
 tool/flutter_ci_script_beta.sh   | 13 ++++++++++---
 tool/flutter_ci_script_dev.sh    |  5 ++++-
 tool/flutter_ci_script_stable.sh |  2 ++
 tool/ios_ci_script.sh            |  2 ++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/tool/android_ci_script.sh b/tool/android_ci_script.sh
index c73158c29..b2f3fb54f 100755
--- a/tool/android_ci_script.sh
+++ b/tool/android_ci_script.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+flutter doctor -v
+
 echo "Fetching dependencies and building 'prebuilt_module/flutter_module/'."
 pushd add_to_app/prebuilt_module/flutter_module/
 flutter packages get
diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh
index 2c7c2302f..43591cc6e 100755
--- a/tool/flutter_ci_script_beta.sh
+++ b/tool/flutter_ci_script_beta.sh
@@ -5,13 +5,18 @@ set -e
 DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
+flutter doctor -v
+
 declare -ar PROJECT_NAMES=(
-    "add_to_app/books/flutter_module_books"
+    # TODO(redbrogdon) Replace use of mockito
+    # "add_to_app/books/flutter_module_books"
     "add_to_app/fullscreen/flutter_module"
     "add_to_app/multiple_flutters/multiple_flutters_module"
     "add_to_app/plugin/flutter_module_using_plugin"
     "add_to_app/prebuilt_module/flutter_module"
-    "animations"
+    # TODO(redbrogdon): Update once this PR makes it to release:
+    # https://github.com/flutter/flutter/pull/79860
+    # "animations"
     # TODO(redbrogdon): Restore during next beta branch merge.
     # "experimental/desktop_photo_search"
     "experimental/federated_plugin/federated_plugin"
@@ -20,7 +25,9 @@ declare -ar PROJECT_NAMES=(
     "flutter_maps_firestore"
     "infinite_list"
     "ios_app_clip"
-    "isolate_example"
+    # TODO(redbrogdon): Update once this PR makes it to release:
+    # https://github.com/flutter/flutter/pull/79860
+    # "isolate_example"
     "jsonexample"
     "null_safety/null_safe_app"
     "null_safety/null_unsafe_app"
diff --git a/tool/flutter_ci_script_dev.sh b/tool/flutter_ci_script_dev.sh
index f8f8e4553..8fcc9fcb6 100755
--- a/tool/flutter_ci_script_dev.sh
+++ b/tool/flutter_ci_script_dev.sh
@@ -5,8 +5,11 @@ set -e
 DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
+flutter doctor -v
+
 declare -ar PROJECT_NAMES=(
-    "add_to_app/books/flutter_module_books"
+    # TODO(redbrogdon) Replace use of mockito
+    # "add_to_app/books/flutter_module_books"
     "add_to_app/fullscreen/flutter_module"
     "add_to_app/multiple_flutters/multiple_flutters_module"
     "add_to_app/plugin/flutter_module_using_plugin"
diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh
index db27f46c8..b6db4f4cc 100755
--- a/tool/flutter_ci_script_stable.sh
+++ b/tool/flutter_ci_script_stable.sh
@@ -5,6 +5,8 @@ set -e
 DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
+flutter doctor -v
+
 declare -ar PROJECT_NAMES=(
     "add_to_app/books/flutter_module_books"
     "add_to_app/fullscreen/flutter_module"
diff --git a/tool/ios_ci_script.sh b/tool/ios_ci_script.sh
index 8e6916216..0024b37c2 100755
--- a/tool/ios_ci_script.sh
+++ b/tool/ios_ci_script.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+flutter doctor -v
+
 ###############################################################################
 # Helper functions
 ###############################################################################