Merge "ethernet: reenable testUpdateConfiguration_forOnlyCapabilities" am: 1b8cac56b9 am: 183629c2ea am: 1a70a9a153
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2225580
Change-Id: Ibd7f569ae84f05d33d7168a203f23d7ea852e011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
index f1a6d92..b959c73 100644
--- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
@@ -78,7 +78,6 @@
import org.junit.Assume.assumeFalse
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.Inet6Address
@@ -900,9 +899,6 @@
STATIC_IP_CONFIGURATION.staticIpConfiguration.ipAddress!!)
}
- // TODO(b/240323229): This test is currently flaky due to a race between IpClient restarting and
- // NetworkAgent tearing down the routes. This problem is exacerbated by disabling RS delay.
- @Ignore
@Test
fun testUpdateConfiguration_forOnlyCapabilities() {
val iface = createInterface()