refactor

repertory/repertory_test/include/fixtures/winfsp_fixture.hpp

@@ -47,7 +47,6 @@ protected:
   void SetUp() override {
     if (PROVIDER_INDEX != 0) {
       if (PROVIDER_INDEX == 1) {
-#if defined(PROJECT_ENABLE_S3)
         EXPECT_TRUE(utils::file::delete_directory_recursively(
             "./winfsp_test" + std::to_string(PROVIDER_INDEX)));
 
@@ -86,7 +85,6 @@ protected:
         comm = std::make_unique<curl_comm>(config->get_s3_config());
         provider = std::make_unique<s3_provider>(*config, *comm);
         drive = std::make_unique<winfsp_drive>(*config, lock_data_, *provider);
-#endif
         return;
       }
 

repertory/repertory_test/src/fuse_drive_test.cpp

@@ -535,7 +535,6 @@ TEST(fuse_drive, all_tests) {
 
       switch (idx) {
       case 0U: {
-#if defined(PROJECT_ENABLE_S3)
         config_ptr =
             std::make_unique<app_config>(provider_type::s3, cfg_directory);
         {
@@ -549,9 +548,6 @@ TEST(fuse_drive, all_tests) {
         comm_ptr = std::make_unique<curl_comm>(config_ptr->get_s3_config());
         provider_ptr = std::make_unique<s3_provider>(*config_ptr, *comm_ptr);
         drive_args = std::vector<std::string>({"-s3", "-na", "storj"});
-#else
-        continue;
-#endif
       } break;
 
       case 1U: {

repertory/repertory_test/src/providers_test.cpp

@@ -669,7 +669,6 @@ TEST(providers, encrypt_provider) {
   event_system::instance().stop();
 }
 
-#if defined(PROJECT_ENABLE_S3)
 TEST(providers, s3_provider) {
   const auto config_path =
       utils::path::combine(get_test_dir(), {"s3_provider"});
@@ -707,7 +706,6 @@ TEST(providers, s3_provider) {
   }
   event_system::instance().stop();
 }
-#endif
 
 TEST(providers, sia_provider) {
   const auto config_path =

repertory/repertory_test/src/winfsp_test.cpp

@@ -333,11 +333,9 @@ TEST_F(winfsp_test, all_tests) {
     return;
   }
 
-#if !defined(PROJECT_ENABLE_S3)
   if (PROVIDER_INDEX == 1U) {
     return;
   }
-#endif
 
   std::string mount_point;
   const auto drive_args = mount_setup(mount_point);