From 83e7b8dd07b018b2048c11dec695214ceeb7b879 Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 24 Apr 2023 15:16:27 -0700 Subject: [PATCH] Saving bugreport for the first failed test. When a test fails, we need bugreport, but it's not guaranteed, as per b/279484565. Test: presubmit Bug: 273319213 Change-Id: If71aef768873c2ef57b11f32d628abf97bd76a5a --- .../com/android/launcher3/util/rule/FailureWatcher.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java index 0a0dfcbf5d..51facf49ab 100644 --- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java +++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java @@ -26,6 +26,7 @@ import java.util.zip.ZipOutputStream; public class FailureWatcher extends TestWatcher { private static final String TAG = "FailureWatcher"; + private static boolean sSavedBugreport = false; final private UiDevice mDevice; private final LauncherInstrumentation mLauncher; @@ -127,10 +128,10 @@ public class FailureWatcher extends TestWatcher { dumpCommand("logcat -d -s TestRunner", diagFile(description, "FilteredLogcat", "txt")); // Dump bugreport - final String systemAnomalyMessage = launcher.getSystemAnomalyMessage(false, false); - if (systemAnomalyMessage != null) { - Log.d(TAG, "Saving bugreport, system anomaly message: " + systemAnomalyMessage, e); + if (!sSavedBugreport) { dumpCommand("bugreportz -s", diagFile(description, "Bugreport", "zip")); + // Not saving bugreport for each failure for time and space economy. + sSavedBugreport = true; } }