commit 028c6e29e0ca049ab4b9bc9d966550d2c251050b
author Loïc Sharma <737941+loic-sharma@users.noreply.github.com> Tue Dec 13 21:18:21 2022 -0800
committer GitHub <noreply@github.com> Wed Dec 14 05:18:21 2022 +0000
tree dbf49c0cc9c5184d30f39560842d04e2b88bfe0a
parent f07db4018ac7a34e6b28fdc43f97b641add28dba

[Android] Fix the `run_debug_test_android` device lab test (#117016)

* Fix

* Format

* DO NOT MERGE! Test in presubmit

* Revert "DO NOT MERGE! Test in presubmit"

This reverts commit 41c7186c723d844c288cb4e5fab3284a803f82ae.

dev/devicelab/lib/tasks/run_tests.dart

diff --git a/dev/devicelab/lib/tasks/run_tests.dart b/dev/devicelab/lib/tasks/run_tests.dart
index cbf1c81..5c0955f 100644
--- a/dev/devicelab/lib/tasks/run_tests.dart
+++ b/dev/devicelab/lib/tasks/run_tests.dart
@@ -102,28 +102,34 @@
 
   @override
   TaskResult verify(List<String> stdout, List<String> stderr) {
+    final String gradleTask = release ? 'assembleRelease' : 'assembleDebug';
+    final String apk = release ? 'app-release.apk' : 'app-debug.apk';
+
     _findNextMatcherInList(
       stdout,
-      (String line) => line.startsWith('Launching lib/main.dart on ') && line.endsWith(' in release mode...'),
+      (String line) => line.startsWith('Launching lib/main.dart on ') &&
+        line.endsWith(' in ${release ? 'release' : 'debug'} mode...'),
       'Launching lib/main.dart on',
     );
 
     _findNextMatcherInList(
       stdout,
-      (String line) => line.startsWith("Running Gradle task 'assembleRelease'..."),
-      "Running Gradle task 'assembleRelease'...",
+      (String line) => line.startsWith("Running Gradle task '$gradleTask'..."),
+      "Running Gradle task '$gradleTask'...",
+    );
+
+    // Size information is only included in release builds.
+    _findNextMatcherInList(
+      stdout,
+      (String line) => line.contains('Built build/app/outputs/flutter-apk/$apk') &&
+        (!release || line.contains('MB).')),
+      'Built build/app/outputs/flutter-apk/$apk',
     );
 
     _findNextMatcherInList(
       stdout,
-      (String line) => line.contains('Built build/app/outputs/flutter-apk/app-release.apk (') && line.contains('MB).'),
-      'Built build/app/outputs/flutter-apk/app-release.apk',
-    );
-
-    _findNextMatcherInList(
-      stdout,
-      (String line) => line.startsWith('Installing build/app/outputs/flutter-apk/app-release.apk...'),
-      'Installing build/app/outputs/flutter-apk/app-release.apk...',
+      (String line) => line.startsWith('Installing build/app/outputs/flutter-apk/$apk...'),
+      'Installing build/app/outputs/flutter-apk/$apk...',
     );
 
     _findNextMatcherInList(