| commit | 3953f8bb360a32c914df7f6f17daaa24d69cd755 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Jul 28 05:20:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 05:20:29 2023 +0000 |
| tree | 5de746222b8d115425bd47750623d01f5e19b6b5 | |
| parent | 1d99a55ff542192a4919eba077f3e010344876b2 [diff] | |
| parent | 7b0709c4db110f5418785d32a7c8564bca087eb7 [diff] |
Merge "Increase timeout to deflake tests" into main am: 32a8cbce6f am: bd5350f4bf am: 7b0709c4db Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678020 Change-Id: I982e80aa1718555c8c3be0f775e11e6e43438362 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index 9ae727d..1a169a6 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -2467,7 +2467,8 @@ if (expectedReadFromCarrierConfig) { final ArgumentCaptor<NetworkCapabilities> ncCaptor = ArgumentCaptor.forClass(NetworkCapabilities.class); - verify(mMockNetworkAgent).doSendNetworkCapabilities(ncCaptor.capture()); + verify(mMockNetworkAgent, timeout(TEST_TIMEOUT_MS)) + .doSendNetworkCapabilities(ncCaptor.capture()); final VpnTransportInfo info = (VpnTransportInfo) ncCaptor.getValue().getTransportInfo();