octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-22 08:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly grep for ps args (#2301)

Browse Source
This commit is contained in:
Andrew Gaul 2023-09-03 06:03:45 -07:00 committed by GitHub
parent 68c45ce791
commit 3f64c72c24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/integration-test-main.sh
View File

@ -2386,8 +2386,7 @@ function test_write_data_with_skip() {
#
# delete cache file if using cache
#
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_cache; then
if s3fs_args | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi
@ -2403,8 +2402,7 @@ function test_write_data_with_skip() {
# [NOTE]
# This test uses the file used in the previous test as an existing file.
#
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_cache; then
if s3fs_args | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi
@ -2441,8 +2439,7 @@ function test_write_data_with_skip() {
#
# delete cache file if using cache
#
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_cache; then
if s3fs_args | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi
@ -2559,15 +2556,13 @@ function test_file_names_longer_than_posix() {
}
function add_all_tests {
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_cache; then
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
# shellcheck disable=SC2009
if ! ps u -p "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then
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
@ -2628,12 +2623,10 @@ function add_all_tests {
fi
add_tests test_update_directory_time_subdir
add_tests test_update_chmod_opened_file
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q update_parent_dir_stat; then
if s3fs_args | grep -q update_parent_dir_stat; then
add_tests test_update_parent_directory_time
fi
# shellcheck disable=SC2009
if ! ps u -p "${S3FS_PID}" | grep -q use_xattr; then
if ! s3fs_args | grep -q use_xattr; then
add_tests test_posix_acl
fi
@ -2654,8 +2647,7 @@ function add_all_tests {
add_tests test_not_existed_dir_obj
add_tests test_ut_ossfs
add_tests test_cr_filename
# shellcheck disable=SC2009
if ! ps u -p "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then
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

10
test/test-utils.sh
View File

@ -336,13 +336,11 @@ function aws_cli() {
fi
if [ "$1" = "s3" ] && [ "$2" != "ls" ] && [ "$2" != "mb" ]; then
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_sse=custom; then
if s3fs_args | grep -q use_sse=custom; then
FLAGS="${FLAGS} --sse-c AES256 --sse-c-key fileb:///tmp/ssekey.bin"
fi
elif [ "$1" = "s3api" ] && [ "$2" != "head-bucket" ]; then
# shellcheck disable=SC2009
if ps u -p "${S3FS_PID}" | grep -q use_sse=custom; then
if s3fs_args | grep -q use_sse=custom; then
FLAGS="${FLAGS} --sse-customer-algorithm AES256 --sse-customer-key $(cat /tmp/ssekey) --sse-customer-key-md5 $(cat /tmp/ssekeymd5)"
fi
fi
@ -378,6 +376,10 @@ function make_random_string() {
return 0
}
function s3fs_args() {
ps -o args -p "${S3FS_PID}" --no-headers
}
#
# Local variables:
# tab-width: 4