Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571
This commit is contained in:
Treehugger Robot
2021-03-03 08:55:28 +00:00
committed by Automerger Merge Worker
parent 7ed7c6a3cb a117895548
commit 0343d52623
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 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_NASCENT_DELAY_MS = 300;
// 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 {
return expectBroadcast(TIMEOUT_MS);
return expectBroadcast(BROADCAST_TIMEOUT_MS);
}
public void expectNoBroadcast(int timeoutMs) throws Exception {