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

Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5ab am: 63a7d5bcbf am: 6d52212e33 am: 9cf1900733

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

Change-Id: I2916a1ac52f838378708c897eeed89085c27ce85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-02 07:50:32 +00:00 • committed by Automerger Merge Worker
commit 803025ac9c
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

4
fs_mgr/libfs_avb/tests/basic_test.cpp
View file

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