| commit | 0cfa414b4fc7402a072a18f01ae0115300a034cf | [log] [tgz] |
|---|---|---|
| author | Jimi Chen <jimictw@google.com> | Thu Mar 20 00:25:36 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 20 00:25:36 2025 -0700 |
| tree | 7f2422cd14b9a49a9f303f4aca29f92f602ee909 | |
| parent | d3f31bb90e250e510b4f60866dff7e617c44ae7c [diff] | |
| parent | c049f613728acd728befc1e490f1d6b18930e861 [diff] |
Merge "Skip multi-device tests instead of abort if device is non-B+ devices" into main am: c049f61372 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551060 Change-Id: Ia75b18eb3ab7198bf081141df26f26cb43fe5844 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 3fee99f..fa8a1da 100644 --- a/staticlibs/testutils/host/python/apf_utils.py +++ b/staticlibs/testutils/host/python/apf_utils.py
@@ -442,7 +442,7 @@ "client device is not B+" ) - asserts.abort_class_if(not self.client.isAtLeastB(), "not B+") + asserts.skip_if(not self.client.isAtLeastB(), "not B+") return test_function(self, *args, **kwargs) return wrapper return decorator