commit 8a1327657a87edfa6733ff9ad62e0b4a48205d77
author Chiachang Wang <chiachangwang@google.com> Wed Jan 06 09:12:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 06 09:12:36 2021 +0000
tree 37940053e6d26f46ea746fcd90745d33ec6709a0
parent 9140fe3b08ec465ba4252d80469bc8937df4a956
parent a1a987fee69c76e9816482e59dd4dc0bf4fbaf53

Merge "Fix flaky testNotifyNetwork_WithforceReevaluation test"

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 4d032c2..8f42a61 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -2285,9 +2285,10 @@
         setStatus(mFallbackConnection, 204);
         nm.forceReevaluation(Process.myUid());
         // Expect to send HTTP, HTTPs, FALLBACK and evaluation results.
-        runNetworkTest(VALIDATION_RESULT_INVALID,
+        verifyNetworkTested(VALIDATION_RESULT_INVALID,
                 NETWORK_VALIDATION_PROBE_DNS | NETWORK_VALIDATION_PROBE_FALLBACK,
                 null /* redirectUrl */);
+        HandlerUtils.waitForIdle(nm.getHandler(), HANDLER_TIMEOUT_MS);
     }
 
     @Test