commit a27bbe9eea8224b64fed7de5c7e6732897b3f72d
author Jimi Chen <jimictw@google.com> Thu Mar 20 04:30:28 2025 -0700
committer Jimi Chen <jimictw@google.com> Thu Mar 20 04:33:43 2025 -0700
tree bc71e2dc606d395a0a74e781495428772dae4461
parent 372a15220afd408b0f9101bfbc2c08503cc0d8d9

Revert "Skip multi-device tests instead of abort if device is non-B+ devices"

This reverts commit 372a15220afd408b0f9101bfbc2c08503cc0d8d9.

Reason for revert: this is Android B+ CTS and shouldn't be run with previous release, this can help to catch human error.

Change-Id: I867c63511d4f640e07b8317506291de284efcef3

staticlibs/testutils/host/python/apf_utils.py

diff --git a/staticlibs/testutils/host/python/apf_utils.py b/staticlibs/testutils/host/python/apf_utils.py
index fa8a1da..4835c23 100644
--- a/staticlibs/testutils/host/python/apf_utils.py
+++ b/staticlibs/testutils/host/python/apf_utils.py
@@ -439,10 +439,10 @@
     def wrapper(self, *args, **kwargs):
       asserts.abort_class_if(
         (not hasattr(self, 'client')) or (not hasattr(self.client, 'isAtLeastB')),
-        "client device is not B+"
+        "no valid client attribute"
       )
 
-      asserts.skip_if(not self.client.isAtLeastB(), "not B+")
+      asserts.abort_class_if(not self.client.isAtLeastB(), "client device is not Android B+")
       return test_function(self, *args, **kwargs)
     return wrapper
   return decorator