From e3cbb0a9eb4edd45d36a0345c45803705380b8e3 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Tue, 11 May 2021 12:49:54 +0800 Subject: [PATCH] Fix CtsFsMgrTestCases failures fs_mgr flags "slotselect" and "slotselect_other" are specific to A/B devices, so remove these options from testcases because CtsFsMgrTestCases could be ran on a non-A/B device. Fixes: 187759127 Fixes: 187427233 Test: atest CtsFsMgrTestCases on sdk_phone64_x86_64-userdebug Change-Id: I31c1429652629bb68e0ca504295c959ac7e013e2 --- fs_mgr/tests/fs_mgr_test.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs_mgr/tests/fs_mgr_test.cpp b/fs_mgr/tests/fs_mgr_test.cpp index 83174efc1..eb2919b01 100644 --- a/fs_mgr/tests/fs_mgr_test.cpp +++ b/fs_mgr/tests/fs_mgr_test.cpp @@ -325,14 +325,14 @@ TEST(fs_mgr, ReadFstabFromFile_MountOptions) { TemporaryFile tf; ASSERT_TRUE(tf.fd != -1); std::string fstab_contents = R"fs( -source / ext4 ro,barrier=1 wait,slotselect,avb +source / ext4 ro,barrier=1 wait,avb source /metadata ext4 noatime,nosuid,nodev,discard wait,formattable source /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,reservedsize=128M source /misc emmc defaults defaults -source /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect +source /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait source auto vfat defaults voldmanaged=usb:auto source none swap defaults zramsize=1073741824,max_comp_streams=8 @@ -412,8 +412,8 @@ TEST(fs_mgr, ReadFstabFromFile_FsMgrFlags) { ASSERT_TRUE(tf.fd != -1); std::string fstab_contents = R"fs( source none0 swap defaults wait,check,nonremovable,recoveryonly,verifyatboot,verify -source none1 swap defaults avb,noemulatedsd,notrim,formattable,slotselect,nofail -source none2 swap defaults first_stage_mount,latemount,quota,logical,slotselect_other +source none1 swap defaults avb,noemulatedsd,notrim,formattable,nofail +source none2 swap defaults first_stage_mount,latemount,quota,logical source none3 swap defaults checkpoint=block source none4 swap defaults checkpoint=fs source none5 swap defaults defaults @@ -445,7 +445,6 @@ source none5 swap defaults defaults flags.no_emulated_sd = true; flags.no_trim = true; flags.formattable = true; - flags.slot_select = true; flags.no_fail = true; EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags)); } @@ -458,7 +457,6 @@ source none5 swap defaults defaults flags.late_mount = true; flags.quota = true; flags.logical = true; - flags.slot_select_other = true; EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags)); }