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

Commit 75d3663d authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge "vts_fs_test: Drop restrictions on ext4 userdata." into main

parents cc7d7f13 4793330a

fs_mgr/tests/vts_fs_test.cpp

+3 −10
Original line number Diff line number Diff line
@@ -99,12 +99,7 @@ TEST(fs, PartitionTypes) { 
    ASSERT_TRUE(android::base::Readlink("/dev/block/by-name/super", &super_bdev));

    ASSERT_TRUE(android::base::Readlink("/dev/block/by-name/userdata", &userdata_bdev));



    std::vector<std::string> must_be_f2fs = {"/data"};

    if (vsr_level >= __ANDROID_API_U__ &&

        !DeviceSupportsFeature("android.hardware.type.automotive")) {

        must_be_f2fs.emplace_back("/metadata");

    }



    std::vector<std::string> data_fs = {"/data", "/metadata"};

    for (const auto& entry : fstab) {

        std::string parent_bdev = entry.blk_device;

        while (true) {
@@ -139,10 +134,8 @@ TEST(fs, PartitionTypes) { 
            EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end())

                    << entry.mount_point;

        } else {

            if (std::find(must_be_f2fs.begin(), must_be_f2fs.end(), entry.mount_point) !=

                must_be_f2fs.end()) {

                EXPECT_EQ(entry.fs_type, "f2fs") << entry.mount_point;

            }

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

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

        }

    }

}