fix test
This commit is contained in:
@@ -191,6 +191,7 @@ template <typename provider_t> class drive_fixture : public ::testing::Test {
|
|||||||
public:
|
public:
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
static std::unique_ptr<app_config> config;
|
static std::unique_ptr<app_config> config;
|
||||||
|
static std::unique_ptr<app_config> config2;
|
||||||
static std::unique_ptr<i_meta_db> meta;
|
static std::unique_ptr<i_meta_db> meta;
|
||||||
#endif // !defined(_WIN32)
|
#endif // !defined(_WIN32)
|
||||||
static std::filesystem::path current_directory;
|
static std::filesystem::path current_directory;
|
||||||
@@ -338,14 +339,14 @@ protected:
|
|||||||
#endif // defined(_WIN32)
|
#endif // defined(_WIN32)
|
||||||
|
|
||||||
auto cfg_dir2 = make_cfg_dir(test_dir, "cfg2");
|
auto cfg_dir2 = make_cfg_dir(test_dir, "cfg2");
|
||||||
auto cfg2 = std::make_unique<app_config>(provider_type::remote, cfg_dir2);
|
config2 = std::make_unique<app_config>(provider_type::remote, cfg_dir2);
|
||||||
cfg2->set_enable_drive_events(true);
|
config2->set_enable_drive_events(true);
|
||||||
cfg2->set_event_level(event_level::trace);
|
config2->set_event_level(event_level::trace);
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
cfg2->set_database_type(database_type::sqlite);
|
config2->set_database_type(database_type::sqlite);
|
||||||
#endif // !defined(_WIN32)
|
#endif // !defined(_WIN32)
|
||||||
|
|
||||||
drive_args2 = {"-dd", cfg2->get_data_directory(), "-rm",
|
drive_args2 = {"-dd", config2->get_data_directory(), "-rm",
|
||||||
fmt::format("localhost:{}", provider_t::remote_port)};
|
fmt::format("localhost:{}", provider_t::remote_port)};
|
||||||
|
|
||||||
platform_ops::execute_mount(drive_args2, mount_location);
|
platform_ops::execute_mount(drive_args2, mount_location);
|
||||||
@@ -568,6 +569,9 @@ public:
|
|||||||
template <typename provider_t>
|
template <typename provider_t>
|
||||||
std::unique_ptr<app_config> drive_fixture<provider_t>::config;
|
std::unique_ptr<app_config> drive_fixture<provider_t>::config;
|
||||||
|
|
||||||
|
template <typename provider_t>
|
||||||
|
std::unique_ptr<app_config> drive_fixture<provider_t>::config2;
|
||||||
|
|
||||||
template <typename provider_t>
|
template <typename provider_t>
|
||||||
std::unique_ptr<i_meta_db> drive_fixture<provider_t>::meta{};
|
std::unique_ptr<i_meta_db> drive_fixture<provider_t>::meta{};
|
||||||
#endif // !defined(_WIN32)
|
#endif // !defined(_WIN32)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ TYPED_TEST(fuse_test, misc_can_check_remote_version) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
packet_client client(this->config->get_remote_config());
|
packet_client client(this->config2->get_remote_config());
|
||||||
|
|
||||||
std::uint32_t min_version{};
|
std::uint32_t min_version{};
|
||||||
auto client_version = utils::get_version_number(project_get_version());
|
auto client_version = utils::get_version_number(project_get_version());
|
||||||
@@ -50,7 +50,7 @@ TYPED_TEST(fuse_test, misc_can_fail_invalid_remote_version) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
packet_client client(this->config->get_remote_config());
|
packet_client client(this->config2->get_remote_config());
|
||||||
|
|
||||||
std::uint32_t min_version{};
|
std::uint32_t min_version{};
|
||||||
auto client_version = utils::get_version_number("2.0.7-release");
|
auto client_version = utils::get_version_number("2.0.7-release");
|
||||||
|
|||||||
Reference in New Issue
Block a user