commit 7afb623223ddf79810576a57d45efddecc9c1f52
author Chalard Jean <jchalard@google.com> Fri Apr 14 13:05:34 2023 +0900
committer Chalard Jean <jchalard@google.com> Fri Apr 14 13:05:34 2023 +0900
tree 9bc72944121a996a98504433b390ea516ecdebd8
parent 2b9bcb7830b874bca9db0cab1c569d493543f07b

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

Test: VpnTest
Change-Id: I5ceda621ba96549a514ec98176b799e246e6d9a5

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 426ee1a..e1c3340 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -1630,14 +1630,14 @@
                 ArgumentCaptor.forClass(IkeSessionCallback.class);
 
         // 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);
         verify(mExecutor, atLeastOnce()).schedule(any(Runnable.class), delayCaptor.capture(),
                 eq(TimeUnit.MILLISECONDS));
         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());
 
         // Forget the mIkev2SessionCreator#createIkeSession call and mExecutor#schedule call
@@ -2940,9 +2940,9 @@
         }
 
         @Override
-        public long getNextRetryDelaySeconds(int retryCount) {
+        public long getNextRetryDelayMs(int retryCount) {
             // Simply return retryCount as the delay seconds for retrying.
-            return retryCount;
+            return retryCount * 1000;
         }
 
         @Override