| commit | 5bf0181b36bb1270e3fe40da10e2c587289de083 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Fri Jun 05 09:08:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 05 09:08:06 2020 +0000 |
| tree | f286cd1e99f079be5010b380ae90001cc1a56f72 | |
| parent | a639a7b0102d851bc47030ffc1d1448c32ff5553 [diff] | |
| parent | fbf126a6f8a001b03d98b93467259fc6cd9b5b57 [diff] |
Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8 Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092 Change-Id: I334534979e0da49fd303c40e4d84cc5fdf498dc0
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index f3cd8a9..aa59959 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java
@@ -83,6 +83,7 @@ } private class TestNetworkCallback extends INetworkCallback.Stub { + private static final int TEST_CONNECT_TIMEOUT_MS = 30_000; private static final int TEST_CALLBACK_TIMEOUT_MS = 5_000; private final LinkedBlockingQueue<CallbackInfo> mCallbacks = new LinkedBlockingQueue<>(); @@ -131,7 +132,7 @@ } public Network expectAvailableCallbackAndGetNetwork() { - final CallbackInfo cb = nextCallback(TEST_CALLBACK_TIMEOUT_MS); + final CallbackInfo cb = nextCallback(TEST_CONNECT_TIMEOUT_MS); if (cb.state != CallbackState.AVAILABLE) { fail("Network is not available. Instead obtained the following callback :" + cb);