commit 6f1da9b47927c8357dbe3a41b4aabf83646f04cf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 10 09:35:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 10 09:35:33 2023 +0000
tree 4f1ecabe7ec494fab293ff862666d9a4833fd8e8
parent d45bf5499f39ed74bf696a4c35ab6855b81a251b
parent 40f958b90d0c661d9cdbe4e84be3d4a73a45fddb

Merge "Fix flaky test: testNsdManager_registerOffloadEngine" into main

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 7731ac9..e4ee8de 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -910,12 +910,16 @@
         val record = NsdRegistrationRecord()
         nsdManager.registerService(si, NsdManager.PROTOCOL_DNS_SD, record)
         val addOrUpdateEvent = offloadEngine
-            .expectCallback<TestNsdOffloadEngine.OffloadEvent.AddOrUpdateEvent>()
+            .expectCallbackEventually<TestNsdOffloadEngine.OffloadEvent.AddOrUpdateEvent> {
+                it.info.key.serviceName == serviceName
+            }
         checkOffloadServiceInfo(addOrUpdateEvent.info)
 
         nsdManager.unregisterService(record)
         val unregisterEvent = offloadEngine
-            .expectCallback<TestNsdOffloadEngine.OffloadEvent.RemoveEvent>()
+            .expectCallbackEventually<TestNsdOffloadEngine.OffloadEvent.RemoveEvent> {
+                it.info.key.serviceName == serviceName
+            }
         checkOffloadServiceInfo(unregisterEvent.info)
 
         runAsShell(NETWORK_SETTINGS) {