commit 34f28435e24f6f50fe0ad925013983d94172c28c
author Yuyang Huang <yuyanghuang@google.com> Tue Apr 22 16:42:04 2025 +0900
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 22 18:31:57 2025 -0700
tree 4f6ac9c4a76e92bab2be8e7b4479073668c8e2ce
parent af707dd8d8be95d8f9f32c449e56bca05a6be04c

Remove non-functional IGMPv3 test and flaky APF checks

This commit removes the test_igmpv3_general_query_offload() test
logic. This test fails on user builds because they run on non-rootable
devices, preventing the necessary test operations.

Additionally, the APF counter check logic is removed as it was causing
test flakiness and instability.

Bug: 406570694
Test: TH
Flag: EXEMPT test only change
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3781d05054d0ea20e4eb64350e6dfd54a917c891)
Merged-In: I9f2f32c49737721e537d578d6df41d4062d0684f
Change-Id: I9f2f32c49737721e537d578d6df41d4062d0684f

staticlibs/testutils/host/python/apf_test_base.py

diff --git a/staticlibs/testutils/host/python/apf_test_base.py b/staticlibs/testutils/host/python/apf_test_base.py
index 9d1ea02..c9cda41 100644
--- a/staticlibs/testutils/host/python/apf_test_base.py
+++ b/staticlibs/testutils/host/python/apf_test_base.py
@@ -123,14 +123,16 @@
             == 1
         )
 
-        assert_utils.expect_with_retry(
-            lambda: apf_utils.get_apf_counter(
-                self.clientDevice,
-                self.client_iface_name,
-                counter_name,
+        # TODO: re-enable once the test passes reliably.
+        if False:
+            assert_utils.expect_with_retry(
+                lambda: apf_utils.get_apf_counter(
+                    self.clientDevice,
+                    self.client_iface_name,
+                    counter_name,
+                )
+                > count_before_test
             )
-            > count_before_test
-        )
 
     finally:
         apf_utils.stop_capture_packets(self.serverDevice, self.server_iface_name)

tests/cts/multidevices/apfv6_test.py

diff --git a/tests/cts/multidevices/apfv6_test.py b/tests/cts/multidevices/apfv6_test.py
index c6e5f8d..e06af653 100644
--- a/tests/cts/multidevices/apfv6_test.py
+++ b/tests/cts/multidevices/apfv6_test.py
@@ -129,8 +129,14 @@
             echo_request, "DROPPED_IPV6_ICMP6_ECHO_REQUEST_REPLIED", expected_echo_reply
         )
 
+    def is_running_as_root(self):
+        uid = adb_utils.adb_shell(self.clientDevice, "id -u")
+        return uid == "0"
+
     @apf_utils.at_least_B()
     def test_igmpv3_general_query_offload(self):
+        if not self.is_running_as_root():
+            return
         # use unicast to replace multicast ether dst to prevent flaky due to DTIM skip
         ether = Ether(src=self.server_mac_address, dst=self.client_mac_address)
         ip = IP(