joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Extend timeout for receiving broadcasts"

Browse source
This commit is contained in:
Treehugger Robot 2021-03-03 07:52:41 +00:00 • committed by Gerrit Code Review
commit 08ef7ddaff
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/net/java/com/android/server/ConnectivityServiceTest.java
View file

@ -350,6 +350,9 @@ public class ConnectivityServiceTest {
private static final String TAG = "ConnectivityServiceTest"; private static final String TAG = "ConnectivityServiceTest";
private static final int TIMEOUT_MS = 500; private static final int TIMEOUT_MS = 500;
// Broadcasts can take a long time to be delivered. The test will not wait for that long unless
// there is a failure, so use a long timeout.
private static final int BROADCAST_TIMEOUT_MS = 30_000;
private static final int TEST_LINGER_DELAY_MS = 400; private static final int TEST_LINGER_DELAY_MS = 400;
private static final int TEST_NASCENT_DELAY_MS = 300; private static final int TEST_NASCENT_DELAY_MS = 300;
// Chosen to be less than the linger and nascent timeout. This ensures that we can distinguish // Chosen to be less than the linger and nascent timeout. This ensures that we can distinguish
@ -1687,7 +1690,7 @@ public class ConnectivityServiceTest {
} }
public Intent expectBroadcast() throws Exception { public Intent expectBroadcast() throws Exception {
return expectBroadcast(TIMEOUT_MS); return expectBroadcast(BROADCAST_TIMEOUT_MS);
} }
public void expectNoBroadcast(int timeoutMs) throws Exception { public void expectNoBroadcast(int timeoutMs) throws Exception {