Disable ip_reachability_ignore_organic_nud_failure in some tests. This flag is being rolled out now, and it is causing MTS to fail on devices that have it. Fix: 373270678 Test: test-only change, passes locally (cherry picked from https://android-review.googlesource.com/q/commit:5670f37421c06fa502eed5d9528ecc31e874a6ee) Merged-In: I449d63b101391bfea04bbbe43ad8e7c1c5b1710e Change-Id: I449d63b101391bfea04bbbe43ad8e7c1c5b1710e
diff --git a/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java b/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java index 426e43f..d504b9e 100644 --- a/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java +++ b/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java
@@ -4111,6 +4111,7 @@ } @Test + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_probeFailed() throws Exception { runIpReachabilityMonitorProbeFailedTest(); assertNotifyNeighborLost(ROUTER_LINK_LOCAL /* targetIp */, @@ -4159,6 +4160,7 @@ } @Test + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_mcastResolicitProbeFailed() throws Exception { runIpReachabilityMonitorMcastResolicitProbeFailedTest(); assertNotifyNeighborLost(ROUTER_LINK_LOCAL /* targetIp */, @@ -4301,6 +4303,7 @@ } @Test + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_ORGANIC_NUD_FAILURE_VERSION, enabled = false) public void testIpReachabilityMonitor_ignoreIpv4DefaultRouterOrganicNudFailure_flagoff() throws Exception { @@ -4426,6 +4429,7 @@ @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_ORGANIC_NUD_FAILURE_VERSION, enabled = false) + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_incompleteIpv6DnsServerInDualStack_flagoff() throws Exception { final Inet6Address targetIp = ipv6Addr(IPV6_ON_LINK_DNS_SERVER); @@ -4448,6 +4452,7 @@ @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_ORGANIC_NUD_FAILURE_VERSION, enabled = false) + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_incompleteIpv6DefaultRouterInDualStack_flagoff() throws Exception { runIpReachabilityMonitorAddressResolutionTest(IPV6_OFF_LINK_DNS_SERVER, @@ -4470,6 +4475,7 @@ @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_ORGANIC_NUD_FAILURE_VERSION, enabled = false) + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_ignoreOnLinkIpv6DnsOrganicNudFailure_flagoff() throws Exception { final Inet6Address targetIp = ipv6Addr(IPV6_ON_LINK_DNS_SERVER); @@ -4492,6 +4498,7 @@ @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DNS_SERVER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_INCOMPLETE_IPV6_DEFAULT_ROUTER_VERSION, enabled = false) @Flag(name = IP_REACHABILITY_IGNORE_ORGANIC_NUD_FAILURE_VERSION, enabled = false) + @Flag(name = IP_REACHABILITY_IGNORE_NEVER_REACHABLE_NEIGHBOR_VERSION, enabled = false) public void testIpReachabilityMonitor_ignoreIpv6DefaultRouterOrganicNudFailure_flagoff() throws Exception { runIpReachabilityMonitorAddressResolutionTest(IPV6_OFF_LINK_DNS_SERVER,