Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ff9507d19f0e56258c78d285648fe8d3df6e75c
This commit is contained in:
Sudheer Shanka
2021-03-10 14:58:41 +00:00
committed by Automerger Merge Worker

View File

@@ -152,8 +152,10 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec
// build a meaningful error message // build a meaningful error message
StringBuilder errorBuilder = new StringBuilder("on-device tests failed:\n"); StringBuilder errorBuilder = new StringBuilder("on-device tests failed:\n");
for (Map.Entry<TestDescription, TestResult> resultEntry : for (Map.Entry<TestDescription, TestResult> resultEntry :
result.getTestResults().entrySet()) { result.getTestResults().entrySet()) {
if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) { final TestStatus testStatus = resultEntry.getValue().getStatus();
if (!TestStatus.PASSED.equals(testStatus)
&& !TestStatus.ASSUMPTION_FAILURE.equals(testStatus)) {
errorBuilder.append(resultEntry.getKey().toString()); errorBuilder.append(resultEntry.getKey().toString());
errorBuilder.append(":\n"); errorBuilder.append(":\n");
errorBuilder.append(resultEntry.getValue().getStackTrace()); errorBuilder.append(resultEntry.getValue().getStackTrace());