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

Commit c8964154 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "dm_test.cpp: DeleteDeviceWithTimeout asserts that unique path is... 

Merge "dm_test.cpp: DeleteDeviceWithTimeout asserts that unique path is deleted" into main am: 44a7cadb am: 883986ea

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



Change-Id: I45fbb1a72032761ecc9a7f0167af782a604cd19b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6784255e 883986ea

fs_mgr/libdm/dm_test.cpp

+10 −1
Original line number Diff line number Diff line
@@ -580,9 +580,18 @@ TEST_F(DmTest, DeleteDeviceWithTimeout) { 
    ASSERT_TRUE(dm.GetDmDevicePathByName("libdm-test-dm-linear", &path));

    ASSERT_EQ(0, access(path.c_str(), F_OK));



    std::string unique_path;

    ASSERT_TRUE(dm.GetDeviceUniquePath("libdm-test-dm-linear", &unique_path));

    ASSERT_EQ(0, access(unique_path.c_str(), F_OK));



    ASSERT_TRUE(dm.DeleteDevice("libdm-test-dm-linear", 5s));

    ASSERT_EQ(DmDeviceState::INVALID, dm.GetState("libdm-test-dm-linear"));

    ASSERT_NE(0, access(path.c_str(), F_OK));

    // Check that unique path of this device has been deleteted.

    // Previously this test case used to check that dev node (i.e. /dev/block/dm-XX) has been

    // deleted. However, this introduces a race condition, ueventd will remove the unique symlink

    // (i.e. /dev/block/mapper/by-uuid/...) **before** removing the device node, while DeleteDevice

    // API synchronizes on the unique symlink being deleted.

    ASSERT_NE(0, access(unique_path.c_str(), F_OK));

    ASSERT_EQ(ENOENT, errno);

}