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

Extend timeout for receiving broadcasts

Browse Source 
The test is currently flaky as broadcasts can take a long time
to be delivered, often more than 500ms.
Extend the timeout for broadcasts to 30s.

Historically the test would wait for broadcasts for at most 500ms,
but not verify that they were received before proceeding. This was
fixed recently by adding an assertion, but the assertion needs to
give enough time for the broadcast to be received.

Bug: 173331190
Change-Id: I0760f3418c635aa4d68de5aefdb7120a9d3e930b
Test: atest FrameworksNetTests
This commit is contained in:
Remi NGUYEN VAN
2021-03-03 06:26:07 +00:00
parent df25b4e591
commit 74ba6de40f
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 {