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

Commit 63a7d5bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5 

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



Change-Id: I42ca902df13dd623561dcab721c73c45be153cdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4337794 b90cd3b5

fs_mgr/libfs_avb/tests/avb_util_test.cpp

+8 −3
Original line number Diff line number Diff line
@@ -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);

fs_mgr/libfs_avb/tests/basic_test.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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"));

}