From 250aa5ed7218219b4b62dbaf37655a7eb40e8efa Mon Sep 17 00:00:00 2001 From: wuhaitao3 Date: Thu, 28 Sep 2023 14:20:40 +0800 Subject: [PATCH] Adjust unit tests for supporting chain partition with no ab Test: libfs_avb_internal_test libfs_avb_test Signed-off-by: wuhaitao3 Change-Id: I5f91510e72776ed2ed53756ae94a87b1417ae1a5 --- fs_mgr/libfs_avb/tests/avb_util_test.cpp | 11 ++++++++--- fs_mgr/libfs_avb/tests/basic_test.cpp | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fs_mgr/libfs_avb/tests/avb_util_test.cpp b/fs_mgr/libfs_avb/tests/avb_util_test.cpp index 2e3492012..ee83cda38 100644 --- a/fs_mgr/libfs_avb/tests/avb_util_test.cpp +++ b/fs_mgr/libfs_avb/tests/avb_util_test.cpp @@ -655,10 +655,12 @@ TEST_F(AvbUtilTest, VerifyVBMetaDataWithoutFooter) { " Partition Name: boot\n" " Rollback Index Location: 1\n" " Public key (sha1): cdbb77177f731920bbe0a0f94f84d9038ae0617d\n" + " Flags: 0\n" " Chain Partition descriptor:\n" " Partition Name: system\n" " Rollback Index Location: 2\n" - " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n", + " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n" + " Flags: 0\n", InfoImage("vbmeta.img")); android::base::unique_fd fd(open(vbmeta_path.value().c_str(), O_RDONLY | O_CLOEXEC)); @@ -876,10 +878,12 @@ TEST_F(AvbUtilTest, GetChainPartitionInfo) { " Partition Name: boot\n" " Rollback Index Location: 1\n" " Public key (sha1): cdbb77177f731920bbe0a0f94f84d9038ae0617d\n" + " Flags: 0\n" " Chain Partition descriptor:\n" " Partition Name: vbmeta_system\n" " Rollback Index Location: 2\n" - " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n", + " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n" + " Flags: 0\n", InfoImage("vbmeta.img")); bool fatal_error = false; @@ -909,7 +913,8 @@ TEST_F(AvbUtilTest, GetChainPartitionInfo) { " Chain Partition descriptor:\n" " Partition Name: system\n" " Rollback Index Location: 3\n" - " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n", + " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n" + " Flags: 0\n", InfoImage("vbmeta_system.img")); chained_descriptors = GetChainPartitionInfo(LoadVBMetaData("vbmeta_system.img"), &fatal_error); diff --git a/fs_mgr/libfs_avb/tests/basic_test.cpp b/fs_mgr/libfs_avb/tests/basic_test.cpp index 1c47c0758..d49affb42 100644 --- a/fs_mgr/libfs_avb/tests/basic_test.cpp +++ b/fs_mgr/libfs_avb/tests/basic_test.cpp @@ -268,10 +268,12 @@ TEST_F(BaseFsAvbTest, GenerateVBMetaImageWithChainDescriptors) { " Partition Name: boot\n" " Rollback Index Location: 1\n" " Public key (sha1): cdbb77177f731920bbe0a0f94f84d9038ae0617d\n" + " Flags: 0\n" " Chain Partition descriptor:\n" " Partition Name: system\n" " Rollback Index Location: 2\n" - " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n", + " Public key (sha1): 2597c218aae470a130f61162feaae70afd97f011\n" + " Flags: 0\n", InfoImage("vbmeta.img")); }