commit 391af8dda0ef234f514a69237c86fc2fd5f6727b
author Sudheer Shanka <sudheersai@google.com> Wed Mar 10 14:58:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 10 14:58:41 2021 +0000
tree 6bc347ad246fe503613af6d355069c1b1601c712
parent f4404beddcbb4f17c1c8c1f1d1d696bda9d1a123
parent 188fa60f90068e8fcd23a8a7965902655dca5929

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

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 ce20379..37420bf 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());