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

Merge "Add extra logging when the test fails." into oc-mr1-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2017-09-08 23:12:44 +00:00
committed by Android (Google) Code Review
parent 314d003540 518999df34
commit 27547e6446
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,10 +387,34 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
// Exponential back-off.
timeoutMs = Math.min(timeoutMs*2, NETWORK_TIMEOUT_MS);
}
dumpAllNetworkRules();
fail("Invalid state for expectAvailable=" + expectAvailable + " after " + maxTries
+ " attempts.\nLast error: " + error);
}
private void dumpAllNetworkRules() throws Exception {
final String networkManagementDump = runShellCommand(mInstrumentation,
"dumpsys network_management").trim();
final String networkPolicyDump = runShellCommand(mInstrumentation,
"dumpsys netpolicy").trim();
TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter('\n');
splitter.setString(networkManagementDump);
String next;
Log.d(TAG, ">>> Begin network_management dump");
while (splitter.hasNext()) {
next = splitter.next();
Log.d(TAG, next);
}
Log.d(TAG, "<<< End network_management dump");
splitter.setString(networkPolicyDump);
Log.d(TAG, ">>> Begin netpolicy dump");
while (splitter.hasNext()) {
next = splitter.next();
Log.d(TAG, next);
}
Log.d(TAG, "<<< End netpolicy dump");
}
/**
* Checks whether the network is available as expected.
*