Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ecb2d66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check for failures in base SetUp()" am: ed205412 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2370708



Change-Id: I40b1fa41cc84ebb9e1d66970b49fbd6d4c5842ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fbcebad ed205412

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

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ class CertificateRequestTest : public CertificateRequestTestBase { 
  protected:

    void SetUp() override {

        CertificateRequestTestBase::SetUp();

        ASSERT_FALSE(HasFatalFailure());



        if (rpcHardwareInfo.versionNumber >= VERSION_WITHOUT_TEST_MODE) {

            bytevec keysToSignMac;
@@ -689,6 +690,7 @@ INSTANTIATE_REM_PROV_AIDL_TEST(CertificateRequestTest); 
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. "