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

Cleanup : don't mix seconds and milliseconds in retry delays

Browse Source 
Test: VpnTest
Change-Id: I5ceda621ba96549a514ec98176b799e246e6d9a5
This commit is contained in:
Chalard Jean
2023-04-14 13:05:34 +09:00
parent 2b9bcb7830
commit 7afb623223
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1630,14 +1630,14 @@ public class VpnTest extends VpnTestBase {
ArgumentCaptor.forClass(IkeSessionCallback.class); ArgumentCaptor.forClass(IkeSessionCallback.class);
// Verify retry is scheduled // Verify retry is scheduled
final long expectedDelay = mTestDeps.getNextRetryDelaySeconds(retryIndex) * 1000; final long expectedDelayMs = mTestDeps.getNextRetryDelayMs(retryIndex);
final ArgumentCaptor<Long> delayCaptor = ArgumentCaptor.forClass(Long.class); final ArgumentCaptor<Long> delayCaptor = ArgumentCaptor.forClass(Long.class);
verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), delayCaptor.capture(), verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), delayCaptor.capture(),
eq(TimeUnit.MILLISECONDS)); eq(TimeUnit.MILLISECONDS));
final List<Long> delays = delayCaptor.getAllValues(); final List<Long> delays = delayCaptor.getAllValues();
assertEquals(expectedDelay, (long) delays.get(delays.size() - 1)); assertEquals(expectedDelayMs, (long) delays.get(delays.size() - 1));
verify(mIkev2SessionCreator, timeout(TEST_TIMEOUT_MS + expectedDelay)) verify(mIkev2SessionCreator, timeout(TEST_TIMEOUT_MS + expectedDelayMs))
.createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any()); .createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any());
// Forget the mIkev2SessionCreator#createIkeSession call and mExecutor#schedule call // Forget the mIkev2SessionCreator#createIkeSession call and mExecutor#schedule call
@@ -2940,9 +2940,9 @@ public class VpnTest extends VpnTestBase {
} }
@Override @Override
public long getNextRetryDelaySeconds(int retryCount) { public long getNextRetryDelayMs(int retryCount) {
// Simply return retryCount as the delay seconds for retrying. // Simply return retryCount as the delay seconds for retrying.
return retryCount; return retryCount * 1000;
} }
@Override @Override