From 74ba6de40f7b063474fa47a4136c776fd95dcf51 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 3 Mar 2021 06:26:07 +0000 Subject: [PATCH] Extend timeout for receiving broadcasts 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 --- .../net/java/com/android/server/ConnectivityServiceTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index c7e8282c8e..49453715ec 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -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 {