From ccd4b77440ea934582546843729f487be950d1bc Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 9 Sep 2021 12:44:06 +0800 Subject: [PATCH] Skipping CompareVBMeta() in VerifyVBMetaDataError test case It has some random errors on the cloud, so skpping them for now. Bug: 187303962 Test: atest --host \ libfs_avb_internal_test:libfs_avb_internal_test.AvbUtilTest#VerifyVBMetaDataError Change-Id: I658e3f052f99af645bdd44087f519d58acbe5641 --- fs_mgr/libfs_avb/tests/avb_util_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs_mgr/libfs_avb/tests/avb_util_test.cpp b/fs_mgr/libfs_avb/tests/avb_util_test.cpp index 0288d85cd..6f874a690 100644 --- a/fs_mgr/libfs_avb/tests/avb_util_test.cpp +++ b/fs_mgr/libfs_avb/tests/avb_util_test.cpp @@ -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); }