| commit | ae4a5482686133e6f8dc3809d48eddbb5448543d | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Apr 21 02:13:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 02:13:44 2017 +0000 |
| tree | c9a3a902e7fa804909b8ee86cba9f7e4ea9da10a | |
| parent | 30775693ec452ff04f909ba370a15e6ab879fb68 [diff] | |
| parent | 4ae5e1d2a176b6446404243c94bae53a9faf9821 [diff] |
Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev am: 6ec7be5f3c am: 4ae5e1d2a1 Change-Id: I463fcb144e9a07d6bb4d75bbd7235563879901b6
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 + ")");