| commit | eb66da718c301679d2d9a574634be676ca7d4364 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 19 11:42:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 19 11:42:50 2023 +0000 |
| tree | 4c0384875c3e70a7703471888a270ca118f019bb | |
| parent | f33879f3cb246fda74a8cfcab6897b5269a636d0 [diff] | |
| parent | 4d1d1510c8fa7495319d065a48c02c95f9ddfed1 [diff] |
Merge "Check for failures in base SetUp()" am: ed2054123f am: 6ecb2d666c am: 4d1d1510c8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2370708 Change-Id: Ibad59b68e76bd0e401db3ce18283fde0aae9cf40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp index bbda56d..573f10b 100644 --- a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp +++ b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -404,6 +404,7 @@ protected: void SetUp() override { CertificateRequestTestBase::SetUp(); + ASSERT_FALSE(HasFatalFailure()); if (rpcHardwareInfo.versionNumber >= VERSION_WITHOUT_TEST_MODE) { bytevec keysToSignMac; @@ -689,6 +690,7 @@ class CertificateRequestV2Test : public CertificateRequestTestBase { void SetUp() override { CertificateRequestTestBase::SetUp(); + ASSERT_FALSE(HasFatalFailure()); if (rpcHardwareInfo.versionNumber < VERSION_WITHOUT_TEST_MODE) { GTEST_SKIP() << "This test case only applies to RKP v3 and above. "