commit ed2054123fc68fac3c7db7da6ae166729acfc3ed
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 19 10:39:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 10:39:57 2023 +0000
tree d4ed6977341f6257a28498dd0a9f1e7b0c204ade
parent fa44e8e8093a515fb09b26ae8ebe1323c0c36d8d
parent 1bcb602b8541ed2f7f432343e20d8699b3b914e4

Merge "Check for failures in base SetUp()"

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

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. "