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

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

Merge "Deflake libdm#CreateEmptyDevice test" am: 1a257af8 am: 3f89eb94 am: 24b52c45 

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

Change-Id: I878d1dc3e9705f0586d5dcccf10d0dbf7a644e70
parents 6fd94600 24b52c45

fs_mgr/libdm/dm_test.cpp

+2 −6
Original line number Diff line number Diff line
@@ -684,13 +684,9 @@ TEST(libdm, DeleteDeviceDeferredWaitsForLastReference) { 
TEST(libdm, CreateEmptyDevice) {

    DeviceMapper& dm = DeviceMapper::Instance();

    ASSERT_TRUE(dm.CreateEmptyDevice("empty-device"));

    auto guard = android::base::make_scope_guard([&]() { dm.DeleteDevice("empty-device", 5s); });

    auto guard =

            android::base::make_scope_guard([&]() { dm.DeleteDeviceIfExists("empty-device", 5s); });



    // Empty device should be in suspended state.

    ASSERT_EQ(DmDeviceState::SUSPENDED, dm.GetState("empty-device"));



    std::string path;

    ASSERT_TRUE(dm.WaitForDevice("empty-device", 5s, &path));

    // Path should exist.

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

}