diff options
| author | Nikita Ioffe <ioffe@google.com> | 2021-07-15 15:30:09 +0100 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2022-01-04 05:48:59 +0000 |
| commit | 654bb5225bcaedb388839b60675c3751573bb174 (patch) | |
| tree | c7648f3fbebe7b5a1ba56937e8214b0cc6703df5 | |
| parent | ea376a5c0f7a48944083f5f2d40fba5a7f98f8c4 (diff) | |
| download | core-654bb5225bcaedb388839b60675c3751573bb174.tar.gz | |
Deflake libdm#CreateEmptyDevice test
Judging from local experiments, it looks like device-mapper doesn't
always generate a uevent after DM_DEV_CREATE ioctl.
Test: presubmit
Bug: 193462349
Change-Id: I8a74375631b20c14a32a41dbaf38380ebc0078e6
Merged-In: I8a74375631b20c14a32a41dbaf38380ebc0078e6
| -rw-r--r-- | fs_mgr/libdm/dm_test.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs_mgr/libdm/dm_test.cpp b/fs_mgr/libdm/dm_test.cpp index 8314ec596..541f254cb 100644 --- a/fs_mgr/libdm/dm_test.cpp +++ b/fs_mgr/libdm/dm_test.cpp @@ -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)); } |