commit 561b53422700a1e04247fe66b9db5f936ec37682
author Ying Xu <yinxu@google.com> Tue Mar 26 16:06:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 26 16:06:22 2024 +0000
tree e72f724c12978ed160f96be15251d00500bef403
parent dc267df5553dcd02ee7cc8428d6cb71b1f63b108
parent ab00a8e4c8fa59f91135faa7570008fb7401e695

Merge "Fix the test flakiness." into main

tests/unit/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index f41d7b2..1f8a743 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -17434,11 +17434,12 @@
         }
 
         mWiFiAgent.disconnect();
-        waitForIdle();
 
         if (expectUnavailable) {
+            testFactory.expectRequestRemove();
             testFactory.assertRequestCountEquals(0);
         } else {
+            testFactory.expectRequestAdd();
             testFactory.assertRequestCountEquals(1);
         }