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

ConnectivityServiceTest: more tweaks to testRequestBenchmark

Browse Source 
Recent continuous testing runs indicates that commit 79614aee did not
completely fixed the issue with testRequestBenchmark.

This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.

In addition timeouts are adjusted to take into account recent failures
observed.

This is the last pending action before turning on FrameworksNetTests on
presubmits.

Bug: 32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb
This commit is contained in:
Hugo Benichi
2017-05-29 13:13:52 +09:00
parent df8b274a65
commit 4d7887a2fa
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -2411,8 +2411,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
} }
@Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing. @Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing.
@SmallTest public void benchmarkRequestRegistrationAndCallbackDispatch() throws Exception {
public void testRequestBenchmark() throws Exception {
// TODO: turn this unit test into a real benchmarking test. // TODO: turn this unit test into a real benchmarking test.
// Benchmarks connecting and switching performance in the presence of a large number of // Benchmarks connecting and switching performance in the presence of a large number of
// NetworkRequests. // NetworkRequests.
@@ -2422,9 +2421,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// and NUM_REQUESTS onAvailable callbacks to fire. // and NUM_REQUESTS onAvailable callbacks to fire.
// See how long it took. // See how long it took.
final int NUM_REQUESTS = 90; final int NUM_REQUESTS = 90;
final int REGISTER_TIME_LIMIT_MS = 180; final int REGISTER_TIME_LIMIT_MS = 200;
final int CONNECT_TIME_LIMIT_MS = 50; final int CONNECT_TIME_LIMIT_MS = 60;
final int SWITCH_TIME_LIMIT_MS = 50; final int SWITCH_TIME_LIMIT_MS = 60;
final int UNREGISTER_TIME_LIMIT_MS = 20; final int UNREGISTER_TIME_LIMIT_MS = 20;
final NetworkRequest request = new NetworkRequest.Builder().clearCapabilities().build(); final NetworkRequest request = new NetworkRequest.Builder().clearCapabilities().build();