Merge "Revert "Skip multi-device tests instead of abort if device is non-B+ devices"" into main am: 23cfd04e9b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551082
Change-Id: I97742bf2f7e5cb75882b8d7d425afc821e9716c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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