LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Deflake doTestPlatformVpnWithException related tests" into main

Browse Source
This commit is contained in:
Chiachang Wang
2023-07-31 08:54:14 +00:00
committed by Gerrit Code Review
parent ebdda22240 9f9a4dc69c
commit 52f3e8f29e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1346,7 +1346,8 @@ public class VpnTest extends VpnTestBase {
final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
final int verifyTimes = profileState.length; final int verifyTimes = profileState.length;
verify(userContext, times(verifyTimes)).startService(intentArgumentCaptor.capture()); verify(userContext, timeout(TEST_TIMEOUT_MS).times(verifyTimes))
.startService(intentArgumentCaptor.capture());
for (int i = 0; i < verifyTimes; i++) { for (int i = 0; i < verifyTimes; i++) {
final Intent intent = intentArgumentCaptor.getAllValues().get(i); final Intent intent = intentArgumentCaptor.getAllValues().get(i);
@@ -1658,7 +1659,7 @@ public class VpnTest extends VpnTestBase {
verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), anyLong(), any()); verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), anyLong(), any());
} else { } else {
final IkeSessionCallback ikeCb = captor.getValue(); final IkeSessionCallback ikeCb = captor.getValue();
ikeCb.onClosedWithException(exception); mExecutor.execute(() -> ikeCb.onClosedWithException(exception));
} }
verifyPowerSaveTempWhitelistApp(TEST_VPN_PKG); verifyPowerSaveTempWhitelistApp(TEST_VPN_PKG);
@@ -1677,7 +1678,7 @@ public class VpnTest extends VpnTestBase {
int retryIndex = 0; int retryIndex = 0;
final IkeSessionCallback ikeCb2 = verifyRetryAndGetNewIkeCb(retryIndex++); final IkeSessionCallback ikeCb2 = verifyRetryAndGetNewIkeCb(retryIndex++);
ikeCb2.onClosedWithException(exception); mExecutor.execute(() -> ikeCb2.onClosedWithException(exception));
verifyRetryAndGetNewIkeCb(retryIndex++); verifyRetryAndGetNewIkeCb(retryIndex++);
} }
} }
@@ -1688,11 +1689,8 @@ public class VpnTest extends VpnTestBase {
// Verify retry is scheduled // Verify retry is scheduled
final long expectedDelayMs = mTestDeps.getNextRetryDelayMs(retryIndex); final long expectedDelayMs = mTestDeps.getNextRetryDelayMs(retryIndex);
final ArgumentCaptor<Long> delayCaptor = ArgumentCaptor.forClass(Long.class); verify(mExecutor, timeout(TEST_TIMEOUT_MS)).schedule(any(Runnable.class),
verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), delayCaptor.capture(), eq(expectedDelayMs), eq(TimeUnit.MILLISECONDS));
eq(TimeUnit.MILLISECONDS));
final List<Long> delays = delayCaptor.getAllValues();
assertEquals(expectedDelayMs, (long) delays.get(delays.size() - 1));
verify(mIkev2SessionCreator, timeout(TEST_TIMEOUT_MS + expectedDelayMs)) verify(mIkev2SessionCreator, timeout(TEST_TIMEOUT_MS + expectedDelayMs))
.createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any()); .createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any());