LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev

Browse Source 
am: 91b52b4043

Change-Id: I8177cc215297566af2fb9ac206c5c425071fd3aa
This commit is contained in:
Jeff Sharkey
2017-09-14 16:56:06 +00:00
committed by android-build-merger
parent c7779d69ab 459e28159c
commit be3000bc35
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -612,11 +612,15 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
NetworkInfo info = null; NetworkInfo info = null;
for (int i = 1; i <= maxTries; i++) { for (int i = 1; i <= maxTries; i++) {
info = mCm.getActiveNetworkInfo(); info = mCm.getActiveNetworkInfo();
if (info != null) { if (info == null) {
Log.v(TAG, "No active network info on attempt #" + i
+ "; sleeping 1s before polling again");
} else if (mCm.isActiveNetworkMetered() != expected) {
Log.v(TAG, "Wrong metered status for active network " + info + "; expected="
+ expected + "; sleeping 1s before polling again");
} else {
break; break;
} }
Log.v(TAG, "No active network info on attempt #" + i
+ "; sleeping 1s before polling again");
Thread.sleep(SECOND_IN_MS); Thread.sleep(SECOND_IN_MS);
} }
assertNotNull("No active network after " + maxTries + " attempts", info); assertNotNull("No active network after " + maxTries + " attempts", info);