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

Commit 589de800 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "vts_fs_test: Only check /data and /metadata for rw partitions." into... 

Merge "vts_fs_test: Only check /data and /metadata for rw partitions." into main am: dbaab24d am: a0760d0b

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



Change-Id: Idf8e02fcc9cce808ad904ac76bf965d2f5295603
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c99d4b7 a0760d0b

fs_mgr/tests/vts_fs_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -133,9 +133,10 @@ TEST(fs, PartitionTypes) { 
            std::vector<std::string> allowed = {"erofs", "ext4", "f2fs"};

            EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end())

                    << entry.mount_point;

        } else {

        } else if (std::find(data_fs.begin(), data_fs.end(), entry.mount_point) != data_fs.end()) {

            std::vector<std::string> allowed = {"ext4", "f2fs"};

            EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end());

            EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end())

                    << entry.mount_point << ", " << entry.fs_type;

        }

    }

}