| commit | 4ae5e1d2a176b6446404243c94bae53a9faf9821 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Apr 21 02:06:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 02:06:21 2017 +0000 |
| tree | 9240cf02d164c975ebfcbb59bad9b046faa56fae | |
| parent | 92a7123377128c6185bcec8e562b6c85fb2fa009 [diff] | |
| parent | 99ec4c0d91baddd70364da7e65091dc7a6494fd9 [diff] |
Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev am: 6ec7be5f3c Change-Id: I1fbbb4f651cc227a59d3d19f871ed3b6679e03b0
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index b6857ae..577f62c 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -833,9 +833,7 @@ } if (latch.await(FOREGROUND_PROC_NETWORK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) { if (!errors[0].isEmpty()) { - // TODO: revert this change once b/35523062 is fixed. -// fail("Network is not available for app2 (" + mUid + "): " + errors[0]); - assertForegroundNetworkAccess(); + fail("Network is not available for app2 (" + mUid + "): " + errors[0]); } } else { fail("Timed out waiting for network availability status from app2 (" + mUid + ")");