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

Merge "Increase ConnDiagsTest timeout for end-to-end test."

Browse Source
This commit is contained in:
Lorenzo Colitti
2020-06-26 07:13:56 +00:00
committed by Gerrit Code Review
parent ee8feba3c1 c8d9a5706e
commit a86ff10ecf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
View File

@@ -106,6 +106,7 @@ public class ConnectivityDiagnosticsManagerTest {
private static final int UNKNOWN_DETECTION_METHOD = 4; private static final int UNKNOWN_DETECTION_METHOD = 4;
private static final int FILTERED_UNKNOWN_DETECTION_METHOD = 0; private static final int FILTERED_UNKNOWN_DETECTION_METHOD = 0;
private static final int CARRIER_CONFIG_CHANGED_BROADCAST_TIMEOUT = 5000; private static final int CARRIER_CONFIG_CHANGED_BROADCAST_TIMEOUT = 5000;
private static final int DELAY_FOR_ADMIN_UIDS_MILLIS = 2000;
private static final Executor INLINE_EXECUTOR = x -> x.run(); private static final Executor INLINE_EXECUTOR = x -> x.run();
@@ -266,7 +267,8 @@ public class ConnectivityDiagnosticsManagerTest {
// CS does not trigger NetworkCallback#onCapabilitiesChanged as changing the // CS does not trigger NetworkCallback#onCapabilitiesChanged as changing the
// administratorUids is not a publicly visible change. In lieu of a better signal to // administratorUids is not a publicly visible change. In lieu of a better signal to
// detministically wait for, use Thread#sleep here. // detministically wait for, use Thread#sleep here.
Thread.sleep(500); // TODO(b/157949581): replace this Thread#sleep with a deterministic signal
Thread.sleep(DELAY_FOR_ADMIN_UIDS_MILLIS);
final TestConnectivityDiagnosticsCallback connDiagsCallback = final TestConnectivityDiagnosticsCallback connDiagsCallback =
createAndRegisterConnectivityDiagnosticsCallback(CELLULAR_NETWORK_REQUEST); createAndRegisterConnectivityDiagnosticsCallback(CELLULAR_NETWORK_REQUEST);