Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614

am: 7bbdfcd8eb

Change-Id: I96c39ca1899768d039a108426fb04655aaf8d55f
This commit is contained in:
Hugo Benichi
2017-05-31 04:10:03 +00:00
committed by android-build-merger

View File

@@ -2415,8 +2415,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.
@@ -2426,9 +2425,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();