This commit is contained in:
parent
b8cd42e235
commit
18d05ca635
@ -196,9 +196,11 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void execute_unmount() {
|
static void execute_unmount() {
|
||||||
auto unmount_cmd = "./repertory -dd \"" + config->get_data_directory() +
|
#if FUSE_USE_VERSION >= 30
|
||||||
"\"" + " " + utils::string::join(drive_args, ' ') +
|
auto unmount_cmd = "fusermount3 -u \"" + mount_location + "\"";
|
||||||
" -unmount";
|
#else
|
||||||
|
auto unmount_cmd = "fusermount -u \"" + mount_location + "\"";
|
||||||
|
#endif
|
||||||
|
|
||||||
auto unmounted{false};
|
auto unmounted{false};
|
||||||
for (int i = 0; not unmounted && (i < 50); i++) {
|
for (int i = 0; not unmounted && (i < 50); i++) {
|
||||||
|
@ -535,7 +535,6 @@ TYPED_TEST(fuse_test, can_chmod_if_owner) {
|
|||||||
TYPED_TEST(fuse_test, can_not_chmod_if_not_owner) {
|
TYPED_TEST(fuse_test, can_not_chmod_if_not_owner) {
|
||||||
std::string file_name{"chmod_test"};
|
std::string file_name{"chmod_test"};
|
||||||
auto file_path = this->create_root_file(file_name);
|
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(-1, chmod(file_path.c_str(), S_IRUSR | S_IWUSR));
|
||||||
EXPECT_EQ(EPERM, errno);
|
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, stat64(file_path.c_str(), &unix_st));
|
||||||
|
|
||||||
EXPECT_EQ(0, chown(file_path.c_str(), static_cast<uid_t>(-1), getgid()));
|
EXPECT_EQ(0, chown(file_path.c_str(), static_cast<uid_t>(-1), getgid()));
|
||||||
std::cout << errno << std::endl;
|
|
||||||
std::this_thread::sleep_for(SLEEP_SECONDS);
|
std::this_thread::sleep_for(SLEEP_SECONDS);
|
||||||
|
|
||||||
struct stat64 unix_st2 {};
|
struct stat64 unix_st2 {};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user