commit f3774740d1918dc1324b0d77dde01b292a6c14a8
author Sudheer Shanka <sudheersai@google.com> Wed Mar 10 15:44:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 10 15:44:15 2021 +0000
tree 7599a65e80acd854f20fd5d7ae8b5b27917968c9
parent ceb0a6e7ba0335ce3446f5004da84cd8628712a2
parent 391af8dda0ef234f514a69237c86fc2fd5f6727b

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3858650d6c90212384c982a8d916e622d16f712

tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java

diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
index 9f03af9..89c79d3 100644
--- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
+++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
@@ -152,8 +152,10 @@
             // build a meaningful error message
             StringBuilder errorBuilder = new StringBuilder("on-device tests failed:\n");
             for (Map.Entry<TestDescription, TestResult> resultEntry :
-                result.getTestResults().entrySet()) {
-                if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) {
+                    result.getTestResults().entrySet()) {
+                final TestStatus testStatus = resultEntry.getValue().getStatus();
+                if (!TestStatus.PASSED.equals(testStatus)
+                        && !TestStatus.ASSUMPTION_FAILURE.equals(testStatus)) {
                     errorBuilder.append(resultEntry.getKey().toString());
                     errorBuilder.append(":\n");
                     errorBuilder.append(resultEntry.getValue().getStackTrace());