ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Skipping CompareVBMeta() in VerifyVBMetaDataError test case" am: 237ec60d0b am: da434b5f77 am: fd911be663 am: 94ad11292a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1821976

Change-Id: I29cbfb0473ed77f0f36c6bf1a1336d24ed43b960
This commit is contained in:
Treehugger Robot 2021-09-10 05:30:04 +00:00 • committed by Automerger Merge Worker
commit e5988f2e48
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/libfs_avb/tests/avb_util_test.cpp
View file

@ -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);
}