From cd833aa11075ac1041531270060e1fb3ba8aa5ac Mon Sep 17 00:00:00 2001 From: Kun Yi Date: Fri, 22 Nov 2019 14:59:40 -0800 Subject: Fix openFiles refcount The old code deletes session from the session map before doing a lookup of the path. Fix the order and add a unit test to catch the error case. (The unit test would fail without this fix). Signed-off-by: Kun Yi Change-Id: If043d6aad7bbaafa19ae3b63a6d9cc7a836d25b5 --- test/manager_delete_unittest.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'test/manager_delete_unittest.cpp') diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp index 9ad3afd..0a59aa7 100644 --- a/test/manager_delete_unittest.cpp +++ b/test/manager_delete_unittest.cpp @@ -84,4 +84,28 @@ TEST(ManagerDeleteTest, FileIsNotOpenAndHandlerSucceeds) // Try to delete the file. EXPECT_TRUE(mgr.deleteBlob(path)); } + +TEST(ManagerDeleteTest, DeleteWorksAfterOpenClose) +{ + // The Blob manager is able to decrement the ref count and delete. + + BlobManager mgr; + std::unique_ptr m1 = std::make_unique(); + auto m1ptr = m1.get(); + EXPECT_TRUE(mgr.registerHandler(std::move(m1))); + + uint16_t flags = OpenFlags::read, sess; + std::string path = "/asdf/asdf"; + + EXPECT_CALL(*m1ptr, canHandleBlob(path)).WillRepeatedly(Return(true)); + EXPECT_CALL(*m1ptr, open(_, flags, path)).WillOnce(Return(true)); + EXPECT_CALL(*m1ptr, close(_)).WillOnce(Return(true)); + EXPECT_CALL(*m1ptr, deleteBlob(path)).WillOnce(Return(true)); + + EXPECT_TRUE(mgr.open(flags, path, &sess)); + EXPECT_TRUE(mgr.close(sess)); + + // Try to delete the file. + EXPECT_TRUE(mgr.deleteBlob(path)); +} } // namespace blobs -- cgit v1.2.3