Merge "Revert "Disable NsdManager tests that need a new prebuilt"" into tm-dev am: 6d43bead70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18888071
Change-Id: Ibd65d20144e5e556afa6cb071158098b46717791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index 69ec189..64cc97d 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -65,7 +65,6 @@
import org.junit.Assert.assertTrue
import org.junit.Assume.assumeTrue
import org.junit.Before
-import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import java.net.ServerSocket
@@ -464,7 +463,7 @@
}
}
- @Test @Ignore // TODO(b/234099453): re-enable when the prebuilt module is updated
+ @Test
fun testNsdManager_DiscoverWithNetworkRequest() {
// This test requires shims supporting T+ APIs (discovering on network request)
assumeTrue(TestUtils.shouldTestTApis())
@@ -532,7 +531,7 @@
}
}
- @Test @Ignore // TODO(b/234099453): re-enable when the prebuilt module is updated
+ @Test
fun testNsdManager_DiscoverWithNetworkRequest_NoMatchingNetwork() {
// This test requires shims supporting T+ APIs (discovering on network request)
assumeTrue(TestUtils.shouldTestTApis())