commit 100851f43ca108637e492886e74ef45f84c19334
author Chiachang Wang <chiachangwang@google.com> Mon Apr 26 04:45:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 04:45:16 2021 +0000
tree 2e329e792eabe948954ae3f7f396cca825d73a9c
parent 3ae1af33755b2a98ecfa97a80a8197ebc01fa98e
parent 293996cc1685c893a0692f5962505aae26e003c0

Merge "Set last probing time to always evaluate stall" am: 8f53706325 am: 0d7d2be276 am: 293996cc16

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1684386

Change-Id: Id392696df5b67fc4fc42b03e37f3d43952e70994

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index 2735fb6..790043e 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -2023,6 +2023,8 @@
                 ArgumentCaptor.forClass(DataStallDetectionStats.class);
         verify(mDependencies, timeout(HANDLER_TIMEOUT_MS).times(1))
                 .writeDataStallDetectionStats(statsCaptor.capture(), probeResultCaptor.capture());
+        // Ensure probe will not stop due to rate-limiting mechanism.
+        nm.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);
         assertTrue(nm.isDataStall());
         assertTrue(probeResultCaptor.getValue().isSuccessful());
         verifyTestDataStallDetectionStats(evalType, transport, statsCaptor.getValue());