Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

limit the verbosity of app crash failure message

Browse Source 
- reporting full dropbox content for all detected crashes leads
  to overly verbose test failure message

Bug: 67002148
Test: http://sponge/4ff3ccb5-c455-45e2-9614-d3527e1f711d
Change-Id: Ic2cd2ba4ce2af0954f186b196c18cc76c19f2007
This commit is contained in:
Guang Zhu
2017-10-25 17:04:25 -07:00
parent 17efe6be85
commit 3bd7187267
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java
View File

@@ -17,13 +17,13 @@
package com.android.compatibilitytest;
import android.app.ActivityManager;
import android.app.ActivityManager.ProcessErrorStateInfo;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.IActivityController;
import android.app.IActivityManager;
import android.app.Instrumentation;
import android.app.UiAutomation;
import android.app.UiModeManager;
import android.app.ActivityManager.RunningTaskInfo;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -72,6 +72,8 @@ public class AppCompatibility {
DROPBOX_TAGS.add("data_app_native_crash");
DROPBOX_TAGS.add("data_app_crash");
}
private static final int MAX_CRASH_SNIPPET_LINES = 20;
private static final int MAX_NUM_CRASH_SNIPPET = 3;
// time waiting for app to launch
private int mAppLaunchTimeout = 7000;
@@ -149,11 +151,18 @@ public class AppCompatibility {
try {
checkDropbox(startTime, packageName);
if (mAppErrors.containsKey(packageName)) {
StringBuilder message = new StringBuilder("Error detected for package: ")
StringBuilder message = new StringBuilder("Error(s) detected for package: ")
.append(packageName);
for (String err : mAppErrors.get(packageName)) {
List<String> errors = mAppErrors.get(packageName);
for (int i = 0; i < MAX_NUM_CRASH_SNIPPET && i < errors.size(); i++) {
String err = errors.get(i);
message.append("\n\n");
message.append(err);
// limit the size of each crash snippet
message.append(truncate(err, MAX_CRASH_SNIPPET_LINES));
}
if (errors.size() > MAX_NUM_CRASH_SNIPPET) {
message.append(String.format("\n... %d more errors omitted ...",
errors.size() - MAX_NUM_CRASH_SNIPPET));
}
Assert.fail(message.toString());
}
@@ -170,6 +179,28 @@ public class AppCompatibility {
}
}
/**
* Truncate the text to at most the specified number of lines, and append a marker at the end
* when truncated
* @param text
* @param maxLines
* @return
*/
private static String truncate(String text, int maxLines) {
String[] lines = text.split("\\r?\\n");
StringBuilder ret = new StringBuilder();
for (int i = 0; i < maxLines && i < lines.length; i++) {
ret.append(lines[i]);
ret.append('\n');
}
if (lines.length > maxLines) {
ret.append("... ");
ret.append(lines.length - maxLines);
ret.append(" more lines truncated ...\n");
}
return ret.toString();
}
/**
* Check dropbox for entries of interest regarding the specified process
* @param startTime if not 0, only check entries with timestamp later than the start time
@@ -255,7 +286,7 @@ public class AppCompatibility {
} else {
errors = new ArrayList<>();
}
errors.add(String.format("type: %s details:\n%s", errorType, errorInfo));
errors.add(String.format("### Type: %s, Details:\n%s", errorType, errorInfo));
mAppErrors.put(pkgName, errors);
}