From 5aae92d233392c8a710f2a3a39baead3c7b909b8 Mon Sep 17 00:00:00 2001 From: Filip Matusiak Date: Thu, 15 Jan 2015 17:48:07 +0100 Subject: [PATCH] Accept more than one SD in NsdManagerTest In current implementation it's been assumed that there will be only one interface registered for service discovery in mdnsresponder. In reality there's possibility that some real but currently unused interfaces will have link-local address assigned prior to registration, which will cause mdnsresponder to register these interfaces for service discovery. This will result in SERVICE_LOST and SERVICE_FOUND events to be received more than one time. Current test implementation is not 100% prone for this situation - depending upon time gap between both events it can PASS or FAIL. Fix by removing an assert on number of received events. Change-Id: I147dc4d600f41f6d63d2b9e4bcb10efe90d5b3ec (cherry picked from commit 970cbe09b59d9d8f2cd3207b432f2eb07741d454) --- tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java index d43472805b..e132cce25f 100644 --- a/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java @@ -372,8 +372,6 @@ public class NsdManagerTest extends AndroidTestCase { assertTrue(lastEvent != null); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); - assertTrue(eventCacheSize() == 2); - // Register service again to see if we discover it checkForAdditionalEvents(); clearEventCache(); @@ -405,7 +403,6 @@ public class NsdManagerTest extends AndroidTestCase { lastEvent.mInfo.getServiceName()); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); - assertTrue(checkCacheSize(2)); checkForAdditionalEvents(); clearEventCache();