commit 23cfd04e9b1baf181aeea1b0e61ab7cb008a2392
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 20 06:11:49 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 20 06:11:49 2025 -0700
tree b823bacefa921e54674c39028309755f83b54a71
parent 8e8bbcabdeb6c394a70e70580734d7324bc2d29d
parent a27bbe9eea8224b64fed7de5c7e6732897b3f72d

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

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