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

Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev am: 1f29891f4b

Browse Source 
am: d6c990a6da

Change-Id: I96b1249b85664e9824c2d3751c15f91e76bd239b
This commit is contained in:
Sudheer Shanka
2017-06-12 19:23:25 +00:00
committed by android-build-merger
parent adb8ebcad1 d6c990a6da
commit 4b6e29853d
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ import android.os.Bundle;
import android.os.SystemClock;
import android.service.notification.NotificationListenerService;
import android.test.InstrumentationTestCase;
import android.text.TextUtils;
import android.util.Log;
import com.android.cts.net.hostside.INetworkStateObserver;
@@ -308,6 +309,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
}
Log.d(TAG, "App not on foreground state on attempt #" + i
+ "; sleeping 1s before trying again");
turnScreenOn();
SystemClock.sleep(SECOND_IN_MS);
}
fail("App2 is not on foreground state after " + maxTries + " attempts: " + state );
@@ -806,8 +808,36 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
protected void setAppIdle(boolean enabled) throws Exception {
Log.i(TAG, "Setting app idle to " + enabled);
final String beforeStats = getUsageStatsDump();
executeSilentShellCommand("am set-inactive " + TEST_APP2_PKG + " " + enabled );
assertAppIdle(enabled); // Sanity check
try {
assertAppIdle(enabled); // Sanity check
} catch (Exception e) {
final String afterStats = getUsageStatsDump();
Log.d(TAG, "UsageStats before:\n" + beforeStats);
Log.d(TAG, "UsageStats after:\n" + afterStats);
throw e;
}
}
private String getUsageStatsDump() throws Exception {
final String output = runShellCommand(mInstrumentation, "dumpsys usagestats").trim();
final StringBuilder sb = new StringBuilder();
final TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter('\n');
splitter.setString(output);
String str;
while (splitter.hasNext()) {
str = splitter.next();
if (str.contains("package=")
&& !str.contains(TEST_PKG) && !str.contains(TEST_APP2_PKG)) {
continue;
}
if (str.contains("config=")) {
continue;
}
sb.append(str).append('\n');
}
return sb.toString();
}
protected void assertAppIdle(boolean enabled) throws Exception {