commit 8b6dac42c93c8de2ae151a5a48cead7a4ed089b8
author Wenhao Wang <wenhaowang@google.com> Fri Jul 16 19:32:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 16 19:32:14 2021 +0000
tree e1023c781977e5c170ea1685063e285fd327513f
parent 1a257af82212ed228328ba7b38507b2fe7175999
parent 6e0a762290e9cd30431ee537b055018d2ff3005d

Merge changes Ib90f8b28,I391ecff9

* changes:
  trusty:storageproxyd: Add wakelock to the UFS commands
  trusty:storageproxyd: Fix return paths on errors

fs_mgr/libdm/dm_test.cpp

diff --git a/fs_mgr/libdm/dm_test.cpp b/fs_mgr/libdm/dm_test.cpp
index 8314ec5..541f254 100644
--- a/fs_mgr/libdm/dm_test.cpp
+++ b/fs_mgr/libdm/dm_test.cpp
@@ -684,13 +684,9 @@
 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));
 }