repertory/librepertory/src/drives/winfsp/winfsp_drive.cpp

@@ -1023,15 +1023,8 @@ auto winfsp_drive::Rename(PVOID /*file_node*/, PVOID /*file_desc*/,
 
   const auto handle_error = [this, &from_api_path,
                              &to_api_path](api_error error) -> NTSTATUS {
-    auto ret = this->handle_error(
+    return this->handle_error(function_name, from_api_path + '|' + to_api_path,
-        function_name, from_api_path + '|' + to_api_path, error, nullptr, 0U);
+                              error, nullptr, 0U);
-    if (ret == FspNtStatusFromWin32(ERROR_FILE_EXISTS)) {
-      ret = FspNtStatusFromWin32(ERROR_ALREADY_EXISTS);
-    } else if (ret == STATUS_OBJECT_NAME_EXISTS) {
-      ret = STATUS_ACCESS_DENIED;
-    }
-
-    return ret;
   };
 
   bool exists{};

repertory/repertory_test/include/fixtures/winfsp_fixture.hpp

@@ -141,7 +141,7 @@ protected:
         ASSERT_TRUE(utils::file::directory(cfg_directory).create_directory());
 
         auto config =
-            std::make_unique<app_config>(provider_type::sia, cfg_directory);
+            std::make_unique<app_config>(provider_type::s3, cfg_directory);
         {
           app_config src_cfg{
               provider_type::sia,
@@ -299,9 +299,10 @@ std::string winfsp_test<provider_t>::mount_location;
 template <typename provider_t>
 std::string winfsp_test<provider_t>::mount_location2;
 
-using winfsp_provider_types =
+// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3,
-    ::testing::Types<local_s3, remote_s3, local_sia, remote_sia,
+// local_sia, remote_sia>;
-                     remote_winfsp_to_linux>;
+// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
+using winfsp_provider_types = ::testing::Types<remote_winfsp_to_linux>;
 } // namespace repertory
 
 #endif // defined(_WIN32)