diff options
| author | 2021-03-03 08:55:28 +0000 | |
|---|---|---|
| committer | 2021-03-03 08:55:28 +0000 | |
| commit | 0343d526237f967d61b71dd41fb9876c62add317 (patch) | |
| tree | 1811e57caa60f777a48740563f63956c6830ac23 | |
| parent | 7ed7c6a3cb98569177b7761f31d9f0191c583581 (diff) | |
| parent | a117895548368bb7c1e7c1b9e705ce19ed19acfd (diff) | |
Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index c7e8282c8e8b..49453715ec0f 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 { |