tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vts_fs_test: Drop restrictions on ext4 userdata.

Browse source 
Bug: 313335353
Test: vts_fs_test
Change-Id: I40be9589f18288ebe2a8569dfaceb9cd2150db85
This commit is contained in:
David Anderson 2024-01-02 13:52:12 -08:00
parent 7ff0bb3091
commit 4793330ad1
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/tests/vts_fs_test.cpp
View file

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