diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp index fb70d3b8..7b5688ad 100644 --- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp +++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp @@ -86,7 +86,7 @@ protected: { app_config src_cfg{ provider_type::s3, - utils::path::combine(test::get_test_config_dir(), {"storj"}), + utils::path::combine(test::get_test_config_dir(), {"repertory_s3"}), }; config->set_enable_drive_events(true); config->set_event_level(event_level::trace); @@ -97,7 +97,7 @@ protected: drive_args = std::vector({ "-s3", "-na", - "storj", + "repertory", }); } break; @@ -254,7 +254,8 @@ std::unique_ptr fuse_test::provider{}; template std::string fuse_test::test_directory; -using fuse_provider_types = ::testing::Types; +// using fuse_provider_types = ::testing::Types; +using fuse_provider_types = ::testing::Types; } // namespace repertory #endif // !defined(_WIN32) diff --git a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp index 7d7d8e6b..a48651dd 100644 --- a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp +++ b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp @@ -78,7 +78,7 @@ protected: { app_config src_cfg{ provider_type::s3, - utils::path::combine(test::get_test_config_dir(), {"storj"}), + utils::path::combine(test::get_test_config_dir(), {"repertory_s3"}), }; config->set_enable_drive_events(true); config->set_event_level(event_level::trace); @@ -141,8 +141,8 @@ protected: } public: - [[nodiscard]] static auto create_directory_and_test(std::string &dir_name) - -> std::string { + [[nodiscard]] static auto + create_directory_and_test(std::string &dir_name) -> std::string { dir_name += std::to_string(++idx); auto api_path = utils::path::create_api_path(dir_name); auto dir_path = utils::path::combine(mount_location, {dir_name}); @@ -153,8 +153,8 @@ public: return dir_path; } - [[nodiscard]] static auto create_file_and_test(std::string &file_name) - -> std::string { + [[nodiscard]] static auto + create_file_and_test(std::string &file_name) -> std::string { file_name += std::to_string(++idx); auto api_path = utils::path::create_api_path(file_name); auto file_path = utils::path::combine(mount_location, {file_name}); diff --git a/repertory/repertory_test/src/fuse_drive_test.cpp b/repertory/repertory_test/src/fuse_drive_test.cpp index 549075d1..6dad1675 100644 --- a/repertory/repertory_test/src/fuse_drive_test.cpp +++ b/repertory/repertory_test/src/fuse_drive_test.cpp @@ -20,7 +20,6 @@ SOFTWARE. */ #if !defined(_WIN32) -#if 0 #include "fixtures/fuse_fixture.hpp" @@ -647,5 +646,4 @@ TYPED_TEST(fuse_test, can_not_chown_user_if_not_root) { } } // namespace repertory -#endif // 0 #endif // !defined(_WIN32)