diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp index 24aaf7d4..60db866f 100644 --- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp +++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp @@ -52,37 +52,21 @@ namespace repertory { struct local_s3 final { static constexpr const provider_type type{provider_type::s3}; static constexpr const provider_type type2{provider_type::s3}; - static constexpr const bool swapped{false}; }; struct local_sia final { static constexpr const provider_type type{provider_type::sia}; static constexpr const provider_type type2{provider_type::sia}; - static constexpr const bool swapped{false}; }; struct remote_s3 final { static constexpr const provider_type type{provider_type::remote}; static constexpr const provider_type type2{provider_type::s3}; - static constexpr const bool swapped{false}; }; struct remote_sia final { static constexpr const provider_type type{provider_type::remote}; static constexpr const provider_type type2{provider_type::sia}; - static constexpr const bool swapped{false}; -}; - -struct remote_winfsp_s3 final { - static constexpr const provider_type type{provider_type::remote}; - static constexpr const provider_type type2{provider_type::s3}; - static constexpr const bool swapped{true}; -}; - -struct remote_winfsp_sia final { - static constexpr const provider_type type{provider_type::remote}; - static constexpr const provider_type type2{provider_type::sia}; - static constexpr const bool swapped{true}; }; template class fuse_test : public ::testing::Test { @@ -142,8 +126,6 @@ protected: execute_mount(drive_args, mount_location); }; - const auto mount_winfsp_s3 = [&]() {}; - const auto mount_sia = [&]() { { auto test_directory = utils::path::combine( @@ -186,8 +168,6 @@ protected: execute_mount(drive_args, mount_location); }; - const auto mount_winfsp_sia = [&]() {}; - const auto mount_remote = [&]() { { mount_location2 = mount_location; @@ -235,19 +215,11 @@ protected: case provider_type::remote: { switch (provider_t::type2) { case provider_type::s3: { - if (provider_t::swapped) { - mount_winfsp_s3(); - } else { - mount_s3(); - } + mount_s3(); } break; case provider_type::sia: { - if (provider_t::swapped) { - mount_winfsp_sia(); - } else { - mount_sia(); - } + mount_sia(); } break; default: