From af339e608606d539ff3d581710622dee0bbc4754 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 8 Nov 2024 05:55:52 -0600 Subject: [PATCH] debugging --- .../winfsp/remotewinfsp/remote_server.cpp | 2 +- .../src/winfsp_drive_delete_test.cpp | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp index fa48b6a4..a01a49b6 100644 --- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp +++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp @@ -923,7 +923,7 @@ auto remote_server::winfsp_can_delete(PVOID file_desc, PWSTR /*file_name*/) auto ret = has_open_info(handle, STATUS_INVALID_HANDLE); if (ret == STATUS_SUCCESS) { - FILE_DISPOSITION_INFO dispositionInfo = {TRUE}; + FILE_DISPOSITION_INFO dispositionInfo{TRUE}; ret = ::SetFileInformationByHandle(handle, FileDispositionInfo, &dispositionInfo, sizeof(FILE_DISPOSITION_INFO)) != 0 diff --git a/repertory/repertory_test/src/winfsp_drive_delete_test.cpp b/repertory/repertory_test/src/winfsp_drive_delete_test.cpp index 9c4c17f4..c8e787b0 100644 --- a/repertory/repertory_test/src/winfsp_drive_delete_test.cpp +++ b/repertory/repertory_test/src/winfsp_drive_delete_test.cpp @@ -192,13 +192,12 @@ TYPED_TEST(winfsp_test, delete_can_delete_after_mapping) { EXPECT_TRUE(::CloseHandle(mapping)); } - EXPECT_TRUE(::DeleteFileA(file_path.c_str())); - EXPECT_TRUE(::DeleteFileA(file_path2.c_str())); - std::this_thread::sleep_for(2s); + ASSERT_TRUE(::DeleteFileA(file_path.c_str())); + ASSERT_TRUE(::DeleteFileA(file_path2.c_str())); - EXPECT_TRUE(::RemoveDirectoryA(dir_path.c_str())); - EXPECT_FALSE(::RemoveDirectoryA(dir_path.c_str())); - EXPECT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError()); + ASSERT_TRUE(::RemoveDirectoryA(dir_path.c_str())); + ASSERT_FALSE(::RemoveDirectoryA(dir_path.c_str())); + ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError()); } TYPED_TEST(winfsp_test, delete_can_delete_on_close_after_mapping) { @@ -271,9 +270,9 @@ TYPED_TEST(winfsp_test, delete_can_delete_on_close_after_mapping) { EXPECT_TRUE(::CloseHandle(handle)); } - EXPECT_TRUE(::RemoveDirectoryA(dir_path.c_str())); - EXPECT_FALSE(::RemoveDirectoryA(dir_path.c_str())); - EXPECT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError()); + ASSERT_TRUE(::RemoveDirectoryA(dir_path.c_str())); + ASSERT_FALSE(::RemoveDirectoryA(dir_path.c_str())); + ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError()); } } // namespace repertory