From c4f83b8c74203a497ff1a92377af172178975393 Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Sat, 2 Nov 2024 13:54:54 +0000 Subject: [PATCH] Test for test_extended_attributes on macos --- .github/workflows/ci.yml | 3 + test/integration-test-common.sh | 2 +- test/integration-test-main.sh | 133 -------------------------------- 3 files changed, 4 insertions(+), 134 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c982759d0..19389414ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ on: # jobs: Linux: + if: false runs-on: ubuntu-latest # # build matrix for containers @@ -180,6 +181,7 @@ jobs: make ALL_TESTS=1 check -C test || (test/filter-suite-log.sh test/test-suite.log; exit 1) MemoryTest: + if: false runs-on: ubuntu-latest # @@ -277,6 +279,7 @@ jobs: /bin/sh -c "ALL_TESTS=1 ASAN_OPTIONS=${ASAN_OPTIONS} TSAN_OPTIONS=${TSAN_OPTIONS} VALGRIND=${VALGRIND} RETRIES=${RETRIES} make check -C test || (test/filter-suite-log.sh test/test-suite.log; exit 1)" clang-tidy: + if: false runs-on: ubuntu-latest container: image: fedora:41 diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 91ffb00850..28bd452711 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -313,7 +313,7 @@ function start_s3fs { ${FUSE_T_ATTRCACHE_OPT} \ -o stat_cache_expire=1 \ -o stat_cache_interval_expire=1 \ - -o dbglevel="${DBGLEVEL:=info}" \ + -o dbglevel="${DBGLEVEL:=dbg}" \ -o no_time_stamp_msg \ -o retries=3 \ -f \ diff --git a/test/integration-test-main.sh b/test/integration-test-main.sh index c42cac29a7..73ee374ad9 100755 --- a/test/integration-test-main.sh +++ b/test/integration-test-main.sh @@ -2722,140 +2722,7 @@ function test_statvfs() { } function add_all_tests { - if s3fs_args | grep -q use_cache; then - add_tests test_cache_file_stat - add_tests test_zero_cache_file_stat - else - add_tests test_file_names_longer_than_posix - fi - if ! s3fs_args | grep -q ensure_diskfree && ! uname | grep -q Darwin; then - add_tests test_clean_up_cache - fi - add_tests test_create_empty_file - add_tests test_append_file - add_tests test_truncate_file - add_tests test_truncate_upload - add_tests test_truncate_empty_file - add_tests test_truncate_shrink_file - add_tests test_truncate_shrink_read_file - add_tests test_mv_file - add_tests test_mv_to_exist_file - add_tests test_mv_empty_directory - add_tests test_mv_nonempty_directory - add_tests test_redirects - add_tests test_mkdir_rmdir - add_tests test_chmod - add_tests test_chown - add_tests test_list - add_tests test_remove_nonempty_directory - add_tests test_external_directory_creation - add_tests test_external_modification - add_tests test_external_creation - add_tests test_read_external_object - add_tests test_read_external_dir_object - add_tests test_update_metadata_external_small_object - add_tests test_update_metadata_external_large_object - add_tests test_rename_before_close - add_tests test_multipart_upload - add_tests test_multipart_copy - - if ! uname | grep -q Darwin || ! s3fs_args | grep -q nocopyapi; then - # FIXME: - # If you specify the nocopyapi option with macos-fuse-t, the following error will - # occur when manipulating the xattr of the copied object: - # "could not copy extended attributes to : Result too large" - # As no solution has been found at this time, this test is bypassed on macos with - # nocopyapi. - # Please pay attention to future developments in macos-fuse-t. - # - add_tests test_multipart_mix - fi - - add_tests test_utimens_during_multipart - add_tests test_special_characters - add_tests test_hardlink - add_tests test_symlink - if ! uname | grep -q Darwin; then - add_tests test_mknod - fi add_tests test_extended_attributes - add_tests test_mtime_file - - add_tests test_update_time_chmod - add_tests test_update_time_chown - add_tests test_update_time_xattr - add_tests test_update_time_touch - if ! mount -t fuse.s3fs | grep "$TEST_BUCKET_MOUNT_POINT_1 " | grep -q -e noatime -e relatime ; then - add_tests test_update_time_touch_a - fi - add_tests test_update_time_append - add_tests test_update_time_cp_p - add_tests test_update_time_mv - - add_tests test_update_directory_time_chmod - add_tests test_update_directory_time_chown - add_tests test_update_directory_time_touch - if ! mount -t fuse.s3fs | grep "$TEST_BUCKET_MOUNT_POINT_1 " | grep -q -e noatime -e relatime ; then - add_tests test_update_directory_time_touch_a - fi - if ! uname | grep -q Darwin; then - # FIXME: - # These test fail in macos-fuse-t because mtime/ctime/atime are not updated. - # Currently, these are not an issue with s3fs, so we will bypass this test for macos. - # Please pay attention to future developments in macos-fuse-t. - # - add_tests test_update_directory_time_set_xattr - add_tests test_update_directory_time_subdir - fi - add_tests test_update_chmod_opened_file - if s3fs_args | grep -q update_parent_dir_stat; then - if ! uname | grep -q Darwin; then - # FIXME: - # In macos-fuse-t, this test can sometimes succeed if the test waits for more - # than one second while it is processing. - # However, the results are currently unstable, thus this test is bypassed on macos. - # Please pay attention to future developments in macos-fuse-t. - # - add_tests test_update_parent_directory_time - fi - fi - if ! s3fs_args | grep -q use_xattr; then - add_tests test_posix_acl - fi - - add_tests test_rm_rf_dir - add_tests test_copy_file - add_tests test_write_after_seek_ahead - add_tests test_overwrite_existing_file_range - add_tests test_concurrent_directory_updates - add_tests test_concurrent_reads - add_tests test_concurrent_writes - add_tests test_open_second_fd - add_tests test_write_multiple_offsets - add_tests test_write_multiple_offsets_backwards - add_tests test_content_type - add_tests test_truncate_cache - add_tests test_upload_sparsefile - add_tests test_mix_upload_entities - # TODO: investigate why only Alpine cannot see the implicit directory objects. - if ! test -f /etc/os-release || ! grep -q -i -e 'ID=alpine' -e 'ID="alpine"' /etc/os-release; then - add_tests test_not_existed_dir_obj - fi - add_tests test_ut_ossfs - add_tests test_cr_filename - if ! s3fs_args | grep -q ensure_diskfree && ! uname | grep -q Darwin; then - add_tests test_ensurespace_move_file - fi - add_tests test_write_data_with_skip - add_tests test_not_boundary_writes - - # [NOTE] - # The test on CI will fail depending on the permissions, so skip these(chmod/chown). - # - # add_tests test_chmod_mountpoint - # add_tests test_chown_mountpoint - add_tests test_time_mountpoint - add_tests test_statvfs } init_suite