From a14524529f779a6a4d6bacc1412b05bf950e07da Mon Sep 17 00:00:00 2001
From: Yuyang Huang <yuyanghuang@google.com>
Date: Thu, 24 Apr 2025 16:34:20 +0900
Subject: [PATCH] Completely disable flaky APF multidevice CTS class

Due to ongoing issues discovered in the APF multidevice CTS, it is safer
to disable the entire test suites rather than individual test cases.
This change removes the ApfV4Test and ApfV6Test classes.

Bug: 406570694
Test: TH
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d3dc48289e39ed39401f5bdc67dffda9deba370)
Merged-In: I0f176e2a075fb33625fcc824418484df10137ccc
Change-Id: I0f176e2a075fb33625fcc824418484df10137ccc
---
 tests/cts/multidevices/Android.bp   | 4 ++--
 tests/cts/multidevices/run_tests.py | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/cts/multidevices/Android.bp b/tests/cts/multidevices/Android.bp
index 00fb93409c..bf73848b93 100644
--- a/tests/cts/multidevices/Android.bp
+++ b/tests/cts/multidevices/Android.bp
@@ -21,8 +21,8 @@ python_test_host {
     name: "CtsConnectivityMultiDevicesTestCases",
     main: "run_tests.py",
     srcs: [
-        "apfv4_test.py",
-        "apfv6_test.py",
+        // "apfv4_test.py",
+        // "apfv6_test.py",
         "connectivity_multi_devices_test.py",
         "run_tests.py",
     ],
diff --git a/tests/cts/multidevices/run_tests.py b/tests/cts/multidevices/run_tests.py
index a0d0bec587..1ac43b9ab9 100644
--- a/tests/cts/multidevices/run_tests.py
+++ b/tests/cts/multidevices/run_tests.py
@@ -15,8 +15,6 @@
 """Main entrypoint for all of test cases."""
 
 import sys
-from apfv4_test import ApfV4Test
-from apfv6_test import ApfV6Test
 from connectivity_multi_devices_test import ConnectivityMultiDevicesTest
 from mobly import suite_runner
 
@@ -36,4 +34,4 @@ if __name__ == "__main__":
     index = sys.argv.index("--")
     sys.argv = sys.argv[:1] + sys.argv[index + 1 :]
   # TODO: make the tests can be executed without manually list classes.
-  suite_runner.run_suite([ConnectivityMultiDevicesTest, ApfV4Test, ApfV6Test], sys.argv)
+  suite_runner.run_suite([ConnectivityMultiDevicesTest], sys.argv)