| commit | bd5350f4bf48a2e79b369b728a39eb6f089d0445 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Jul 28 03:48:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 03:48:59 2023 +0000 |
| tree | e1956294754f4f99565773fab7cb8905ddbf7480 | |
| parent | 9931686d78a5f7a3f0aed76c40dabef0deb6ea5f [diff] | |
| parent | 32a8cbce6fccfcb309aca0a72e1a50ef638e5495 [diff] |
Merge "Increase timeout to deflake tests" into main am: 32a8cbce6f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678020 Change-Id: Id16fd3a1102858de6f0ba046e6d3cdf24ed457d5 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();