diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-07-25 22:30:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-25 22:30:23 +0000 |
| commit | 1b0445dfa4179bb04a4d01ada9561dbd3944a4b1 (patch) | |
| tree | ae697ca3d1414bb346bc3679922fb1a92e618430 /tests | |
| parent | 2cccb134a48b7e6277692c3d1a20d1fa507fe7c4 (diff) | |
| parent | 98193241c391f45566ed1fdee89bfd3054c841ed (diff) | |
| download | android_packages_apps_Trebuchet-1b0445dfa4179bb04a4d01ada9561dbd3944a4b1.tar.gz android_packages_apps_Trebuchet-1b0445dfa4179bb04a4d01ada9561dbd3944a4b1.tar.bz2 android_packages_apps_Trebuchet-1b0445dfa4179bb04a4d01ada9561dbd3944a4b1.zip | |
Merge "Tuning system health diags" into ub-launcher3-qt-r1-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 6 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/TestHelpers.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index f91e2ada7..fe7401ca6 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -331,8 +331,10 @@ public final class LauncherInstrumentation { final String systemHealth = getSystemHealthMessage(); if (systemHealth != null) { - message = message + ", which might be a consequence of system health problems:\n<<<\n" - + systemHealth + "\n>>>"; + message = message + + ", which might be a consequence of system health " + + "problems:\n<<<<<<<<<<<<<<<<<<\n" + + systemHealth + "\n>>>>>>>>>>>>>>>>>>"; } log("Hierarchy dump for: " + message); diff --git a/tests/tapl/com/android/launcher3/tapl/TestHelpers.java b/tests/tapl/com/android/launcher3/tapl/TestHelpers.java index ebe5eac5f..399c59d36 100644 --- a/tests/tapl/com/android/launcher3/tapl/TestHelpers.java +++ b/tests/tapl/com/android/launcher3/tapl/TestHelpers.java @@ -109,6 +109,7 @@ public class TestHelpers { DropBoxManager.Entry entry; StringBuilder errorDetails = new StringBuilder(); while (null != (entry = dropbox.getNextEntry(label, timestamp))) { + if (errorDetails.length() != 0) errorDetails.append("------------------------------"); timestamp = entry.getTimeMillis(); errorDetails.append(new Date(timestamp)); errorDetails.append(": "); @@ -135,7 +136,6 @@ public class TestHelpers { "system_server_crash", "system_server_native_crash", "system_server_watchdog", - "system_server_wtf", }; for (String label : labels) { @@ -143,7 +143,9 @@ public class TestHelpers { if (crash != null) errors.append(crash); } - return errors.length() != 0 ? errors.toString() : null; + return errors.length() != 0 + ? "Current time: " + new Date(System.currentTimeMillis()) + "\n" + errors + : null; } catch (Exception e) { return "Failed to get system health diags, maybe build your test via .bp instead of " + ".mk? " + android.util.Log.getStackTraceString(e); |