commit 32a8cbce6fccfcb309aca0a72e1a50ef638e5495
author Chiachang Wang <chiachangwang@google.com> Fri Jul 28 00:37:42 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 28 00:37:42 2023 +0000
tree e1956294754f4f99565773fab7cb8905ddbf7480
parent 734738767c334e62ff145b2e2bec038ec2970096
parent 595fac08402413a94734209dc9f29feff8ebdae6

Merge "Increase timeout to deflake tests" into main

tests/unit/java/com/android/server/connectivity/VpnTest.java

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();