commit 3f08cc4485e727208fec8ba549f1c7378598cb6e
author Paul Hu <paulhu@google.com> Mon Aug 22 10:29:14 2022 +0000
committer Paul Hu <paulhu@google.com> Mon Aug 22 10:29:14 2022 +0000
tree 10814205f1fa7f5280cebc82d5ca1742b903c8f3
parent dd2eca9e4a5b3f9569197f09b0d50aab7b6ad42f

Reduce the test flake on NsdManagerTest

- Enlarge the time out for waiting callback.
- Ensure the agent disconnected completely after running each
  test.

Test: atest android.net.cts.NsdManagerTest --iteration 100
Change-Id: Icb04641ad5e4cb826995b99679313b12e96e9879

tests/cts/net/src/android/net/cts/NsdManagerTest.kt

diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index a02be85..d598830 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -65,6 +65,7 @@
 import com.android.testutils.filters.CtsNetTestCasesMaxTargetSdk30
 import com.android.testutils.runAsShell
 import com.android.testutils.tryTest
+import com.android.testutils.waitForIdle
 import org.junit.After
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertFalse
@@ -121,6 +122,7 @@
             cm.unregisterNetworkCallback(requestCb)
             agent.unregister()
             iface.fileDescriptor.close()
+            agent.waitForIdle(TIMEOUT_MS)
         }
     }
 
@@ -291,7 +293,7 @@
         val agent = registerTestNetworkAgent(iface.interfaceName)
         val network = agent.network ?: fail("Registered agent should have a network")
         // The network has no INTERNET capability, so will be marked validated immediately
-        cb.expectAvailableThenValidatedCallbacks(network)
+        cb.expectAvailableThenValidatedCallbacks(network, TIMEOUT_MS)
         return TestTapNetwork(iface, cb, agent, network)
     }
 
@@ -319,6 +321,7 @@
                 testNetwork2.close(cm)
             }
         }
+        handlerThread.waitForIdle(TIMEOUT_MS)
         handlerThread.quitSafely()
     }