From 18d05ca6355cc8350fa6131fbc1505ac660faf73 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 24 Oct 2024 20:07:04 -0500 Subject: [PATCH] fixes --- .../repertory_test/include/fixtures/fuse_fixture.hpp | 8 +++++--- repertory/repertory_test/src/fuse_drive_test.cpp | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp index 063a8967..53429431 100644 --- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp +++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp @@ -196,9 +196,11 @@ public: } static void execute_unmount() { - auto unmount_cmd = "./repertory -dd \"" + config->get_data_directory() + - "\"" + " " + utils::string::join(drive_args, ' ') + - " -unmount"; +#if FUSE_USE_VERSION >= 30 + auto unmount_cmd = "fusermount3 -u \"" + mount_location + "\""; +#else + auto unmount_cmd = "fusermount -u \"" + mount_location + "\""; +#endif auto unmounted{false}; for (int i = 0; not unmounted && (i < 50); i++) { diff --git a/repertory/repertory_test/src/fuse_drive_test.cpp b/repertory/repertory_test/src/fuse_drive_test.cpp index ec0a52c6..6dad1675 100644 --- a/repertory/repertory_test/src/fuse_drive_test.cpp +++ b/repertory/repertory_test/src/fuse_drive_test.cpp @@ -535,7 +535,6 @@ TYPED_TEST(fuse_test, can_chmod_if_owner) { TYPED_TEST(fuse_test, can_not_chmod_if_not_owner) { std::string file_name{"chmod_test"}; auto file_path = this->create_root_file(file_name); - std::cout << file_path << std::endl; EXPECT_EQ(-1, chmod(file_path.c_str(), S_IRUSR | S_IWUSR)); EXPECT_EQ(EPERM, errno); @@ -581,7 +580,6 @@ TYPED_TEST(fuse_test, can_chown_group_if_owner_and_a_member_of_the_group) { EXPECT_EQ(0, stat64(file_path.c_str(), &unix_st)); EXPECT_EQ(0, chown(file_path.c_str(), static_cast(-1), getgid())); - std::cout << errno << std::endl; std::this_thread::sleep_for(SLEEP_SECONDS); struct stat64 unix_st2 {};