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

Commit 237ec60d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Skipping CompareVBMeta() in VerifyVBMetaDataError test case"

parents bc4944c1 ccd4b774

fs_mgr/libfs_avb/tests/avb_util_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ TEST_F(AvbUtilTest, VerifyVBMetaDataError) { 
                              nullptr /* out_public_key_data */, &verify_result);

    ASSERT_EQ(0, close(hash_modified_fd.release()));

    EXPECT_NE(nullptr, vbmeta);

    EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta));

    // EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta)); // b/187303962.

    EXPECT_EQ(VBMetaVerifyResult::kErrorVerification, verify_result);



    // Modifies the auxiliary data block.
@@ -795,7 +795,7 @@ TEST_F(AvbUtilTest, VerifyVBMetaDataError) { 
                              nullptr /* out_public_key_data */, &verify_result);

    ASSERT_EQ(0, close(aux_modified_fd.release()));

    EXPECT_NE(nullptr, vbmeta);

    EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta));

    // EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta)); // b/187303962.

    EXPECT_EQ(VBMetaVerifyResult::kErrorVerification, verify_result);



    // Resets previous modification by setting offset to -1, and checks the verification can pass.
@@ -807,7 +807,7 @@ TEST_F(AvbUtilTest, VerifyVBMetaDataError) { 
                              nullptr /* out_public_key_data */, &verify_result);

    ASSERT_EQ(0, close(ok_fd.release()));

    EXPECT_NE(nullptr, vbmeta);

    EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta));

    // EXPECT_TRUE(CompareVBMeta(system_path, *vbmeta)); // b/187303962.

    EXPECT_EQ(VBMetaVerifyResult::kSuccess, verify_result);

}