From 7360b72c7b174f78ffdf18761225dedb195173d1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 18 Nov 2023 23:54:51 -0600 Subject: [PATCH] fix --- tests/fuse_drive_test.cpp | 230 ++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 122 deletions(-) diff --git a/tests/fuse_drive_test.cpp b/tests/fuse_drive_test.cpp index a9d361e1..e7696ddf 100644 --- a/tests/fuse_drive_test.cpp +++ b/tests/fuse_drive_test.cpp @@ -587,130 +587,116 @@ TEST(fuse_drive, all_tests) { std::this_thread::sleep_for(5s); EXPECT_EQ(0, system(("mount|grep \"" + mount_location + "\"").c_str())); - // auto file_path = create_file_and_test(mount_location, "chmod_test"); - // test_chmod(utils::path::create_api_path("chmod_test"), file_path); - // unlink_file_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, "chown_test"); - // test_chown(utils::path::create_api_path("chown_test"), file_path); - // unlink_file_and_test(file_path); - // - // file_path = utils::path::combine(mount_location, {"mkdir_test"}); - // test_mkdir(utils::path::create_api_path("mkdir_test"), file_path); - // rmdir_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, "write_read_test"); - // test_write_and_read(utils::path::create_api_path("write_read_test"), - // file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, "from_rename_file_test"); - // auto to_file_path = utils::path::absolute( - // utils::path::combine(mount_location, {"to_rename_file_test"})); - // test_rename_file(file_path, to_file_path, - // provider_ptr->is_rename_supported()); - // EXPECT_TRUE(utils::file::retry_delete_file(file_path)); - // EXPECT_TRUE(utils::file::retry_delete_file(to_file_path)); - // - // file_path = utils::path::absolute( - // utils::path::combine(mount_location, {"from_rename_dir_test"})); - // to_file_path = utils::path::absolute( - // utils::path::combine(mount_location, {"to_rename_dir_test"})); - // test_rename_directory(file_path, to_file_path, - // provider_ptr->is_rename_supported()); - // EXPECT_TRUE(utils::file::retry_delete_directory(file_path.c_str())); - // EXPECT_TRUE(utils::file::retry_delete_directory(to_file_path.c_str())); + auto file_path = create_file_and_test(mount_location, "chmod_test"); + test_chmod(utils::path::create_api_path("chmod_test"), file_path); + unlink_file_and_test(file_path); - while (true) { - auto file_path = - create_file_and_test(mount_location, "truncate_file_test"); - test_truncate(file_path); - unlink_file_and_test(file_path); - } + file_path = create_file_and_test(mount_location, "chown_test"); + test_chown(utils::path::create_api_path("chown_test"), file_path); + unlink_file_and_test(file_path); - // file_path = create_file_and_test(mount_location, - // "ftruncate_file_test"); test_ftruncate(file_path); - // unlink_file_and_test(file_path); - // - // #ifndef __APPLE__ - // file_path = create_file_and_test(mount_location, - // "fallocate_file_test"); - // test_fallocate(utils::path::create_api_path("fallocate_file_test"), - // file_path); - // unlink_file_and_test(file_path); - // #endif - // - // file_path = create_file_and_test(mount_location, - // "write_fails_ro_test"); - // test_write_operations_fail_if_read_only( - // utils::path::create_api_path("write_fails_ro_test"), - // file_path); - // unlink_file_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, - // "getattr.txt"); - // test_file_getattr(utils::path::create_api_path("getattr.txt"), - // file_path); - // unlink_file_and_test(file_path); - // - // file_path = utils::path::combine(mount_location, - // {"getattr_dir"}); - // test_directory_getattr(utils::path::create_api_path("getattr_dir"), - // file_path); - // rmdir_and_test(file_path); - // - // #if !__APPLE__ && HAS_SETXATTR - // file_path = - // create_file_and_test(mount_location, - // "xattr_invalid_names_test"); - // test_xattr_invalid_parameters(file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, - // "xattr_create_get_test"); - // test_xattr_create_and_get(file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, - // "xattr_listxattr_test"); - // test_xattr_listxattr(file_path); - // unlink_file_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, - // "xattr_replace_test"); test_xattr_replace(file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, - // "xattr_default_create_test"); - // test_xattr_default_create(file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, - // "xattr_default_replace_test"); - // test_xattr_default_replace(file_path); - // unlink_file_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, - // "xattr_create_fails_exists_test"); - // test_xattr_create_fails_if_exists(file_path); - // unlink_file_and_test(file_path); - // - // file_path = create_file_and_test(mount_location, - // "xattr_create_fails_not_exists_test"); - // test_xattr_create_fails_if_not_exists(file_path); - // unlink_file_and_test(file_path); - // - // file_path = - // create_file_and_test(mount_location, - // "xattr_removexattr_test"); - // test_xattr_removexattr(file_path); - // unlink_file_and_test(file_path); - // #endif + file_path = utils::path::combine(mount_location, {"mkdir_test"}); + test_mkdir(utils::path::create_api_path("mkdir_test"), file_path); + rmdir_and_test(file_path); + + file_path = create_file_and_test(mount_location, "write_read_test"); + test_write_and_read(utils::path::create_api_path("write_read_test"), + file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "from_rename_file_test"); + auto to_file_path = utils::path::absolute( + utils::path::combine(mount_location, {"to_rename_file_test"})); + test_rename_file(file_path, to_file_path, + provider_ptr->is_rename_supported()); + EXPECT_TRUE(utils::file::retry_delete_file(file_path)); + EXPECT_TRUE(utils::file::retry_delete_file(to_file_path)); + + file_path = utils::path::absolute( + utils::path::combine(mount_location, {"from_rename_dir_test"})); + to_file_path = utils::path::absolute( + utils::path::combine(mount_location, {"to_rename_dir_test"})); + test_rename_directory(file_path, to_file_path, + provider_ptr->is_rename_supported()); + EXPECT_TRUE(utils::file::retry_delete_directory(file_path.c_str())); + EXPECT_TRUE(utils::file::retry_delete_directory(to_file_path.c_str())); + + file_path = create_file_and_test(mount_location, "truncate_file_test"); + test_truncate(file_path); + unlink_file_and_test(file_path); + + file_path = create_file_and_test(mount_location, "ftruncate_file_test"); + test_ftruncate(file_path); + unlink_file_and_test(file_path); + +#ifndef __APPLE__ + file_path = create_file_and_test(mount_location, "fallocate_file_test"); + test_fallocate(utils::path::create_api_path("fallocate_file_test"), + file_path); + unlink_file_and_test(file_path); +#endif + + file_path = create_file_and_test(mount_location, "write_fails_ro_test"); + test_write_operations_fail_if_read_only( + utils::path::create_api_path("write_fails_ro_test"), file_path); + unlink_file_and_test(file_path); + + file_path = create_file_and_test(mount_location, "getattr.txt"); + test_file_getattr(utils::path::create_api_path("getattr.txt"), + file_path); + unlink_file_and_test(file_path); + + file_path = utils::path::combine(mount_location, {"getattr_dir"}); + test_directory_getattr(utils::path::create_api_path("getattr_dir"), + file_path); + rmdir_and_test(file_path); + +#if !__APPLE__ && HAS_SETXATTR + file_path = + create_file_and_test(mount_location, "xattr_invalid_names_test"); + test_xattr_invalid_parameters(file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "xattr_create_get_test"); + test_xattr_create_and_get(file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "xattr_listxattr_test"); + test_xattr_listxattr(file_path); + unlink_file_and_test(file_path); + + file_path = create_file_and_test(mount_location, "xattr_replace_test"); + test_xattr_replace(file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "xattr_default_create_test"); + test_xattr_default_create(file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "xattr_default_replace_test"); + test_xattr_default_replace(file_path); + unlink_file_and_test(file_path); + + file_path = create_file_and_test(mount_location, + "xattr_create_fails_exists_test"); + test_xattr_create_fails_if_exists(file_path); + unlink_file_and_test(file_path); + + file_path = create_file_and_test(mount_location, + "xattr_create_fails_not_exists_test"); + test_xattr_create_fails_if_not_exists(file_path); + unlink_file_and_test(file_path); + + file_path = + create_file_and_test(mount_location, "xattr_removexattr_test"); + test_xattr_removexattr(file_path); + unlink_file_and_test(file_path); +#endif execute_unmount(mount_location); });