Don't require F2FS for /metadata.android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2

Bug: 237673016
Test: vts_gsi_boot_test
Change-Id: I4d81a3e41dcb865916bed361ecc9537b625d1049
Merged-In: I4d81a3e41dcb865916bed361ecc9537b625d1049

1 files changed, 2 insertions, 6 deletions

diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index d002c89..6aeded3 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp
@@ -63,11 +63,7 @@ TEST(MetadataPartition, MinimumSize) {
     ASSERT_GE(fd, 0);
 
     uint64_t size = get_block_device_size(fd);
-    if (GetVsrLevel() >= __ANDROID_API_T__) {
-        ASSERT_GE(size, 67108864);
-    } else {
-        ASSERT_GE(size, 16777216);
-    }
+    ASSERT_GE(size, 16777216);
 }
 
 TEST(Weaver, MinimumSlots) {
@@ -96,7 +92,7 @@ TEST(MetadataPartition, FsType) {
     Fstab fstab;
     ASSERT_TRUE(ReadDefaultFstab(&fstab));
 
-    std::vector<std::string> mount_points = {"/data", "/metadata"};
+    std::vector<std::string> mount_points = {"/data"};
     for (const auto& mount_point : mount_points) {
         auto path = mount_point + "/gsi";