| commit | 6ecb2d666c29c513fa562d182f1ec3ce4e2f60ac | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 19 10:49:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 19 10:49:14 2023 +0000 |
| tree | 9f5954d2b7f60fb56684c67da3495d9b8c7e74d3 | |
| parent | 4fbcebad7fe2e0e0759468f6e7886d0453c759b2 [diff] | |
| parent | ed2054123fc68fac3c7db7da6ae166729acfc3ed [diff] |
Merge "Check for failures in base SetUp()" am: ed2054123f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2370708 Change-Id: I40b1fa41cc84ebb9e1d66970b49fbd6d4c5842ab 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. "