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

Pass explicit -p option to ps (#1904)

Browse Source 
This ensures that a pid follows.
This commit is contained in:
Andrew Gaul 2022-02-20 20:40:29 +09:00 committed by GitHub
parent e014d6e646
commit 3fa03d4e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1718,7 +1718,7 @@ function test_write_data_with_skip() {
# delete cache file if using cache # delete cache file if using cache
# #
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ps u "${S3FS_PID}" | grep -q use_cache; then if ps u -p "${S3FS_PID}" | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}" 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}" rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi fi
@ -1735,7 +1735,7 @@ function test_write_data_with_skip() {
# This test uses the file used in the previous test as an existing file. # This test uses the file used in the previous test as an existing file.
# #
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ps u "${S3FS_PID}" | grep -q use_cache; then if ps u -p "${S3FS_PID}" | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}" 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}" rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi fi
@ -1773,7 +1773,7 @@ function test_write_data_with_skip() {
# delete cache file if using cache # delete cache file if using cache
# #
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ps u "${S3FS_PID}" | grep -q use_cache; then if ps u -p "${S3FS_PID}" | grep -q use_cache; then
rm -f "${CACHE_DIR}/${TEST_BUCKET_1}/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}" 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}" rm -f "${CACHE_DIR}/.${TEST_BUCKET_1}.stat/${CACHE_TESTRUN_DIR}/${_SKIPWRITE_FILE}"
fi fi
@ -1792,12 +1792,12 @@ function test_write_data_with_skip() {
function add_all_tests { function add_all_tests {
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ps u "${S3FS_PID}" | grep -q use_cache; then if ps u -p "${S3FS_PID}" | grep -q use_cache; then
add_tests test_cache_file_stat add_tests test_cache_file_stat
add_tests test_zero_cache_file_stat add_tests test_zero_cache_file_stat
fi fi
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ! ps u "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then if ! ps u -p "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then
add_tests test_clean_up_cache add_tests test_clean_up_cache
fi fi
add_tests test_create_empty_file add_tests test_create_empty_file
@ -1816,7 +1816,7 @@ function add_all_tests {
add_tests test_list add_tests test_list
add_tests test_remove_nonempty_directory add_tests test_remove_nonempty_directory
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ! ps u "${S3FS_PID}" | grep -q notsup_compat_dir; then if ! ps u -p "${S3FS_PID}" | grep -q notsup_compat_dir; then
# TODO: investigate why notsup_compat_dir fails # TODO: investigate why notsup_compat_dir fails
add_tests test_external_directory_creation add_tests test_external_directory_creation
fi fi
@ -1872,7 +1872,7 @@ function add_all_tests {
add_tests test_mix_upload_entities add_tests test_mix_upload_entities
add_tests test_ut_ossfs add_tests test_ut_ossfs
# shellcheck disable=SC2009 # shellcheck disable=SC2009
if ! ps u "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then if ! ps u -p "${S3FS_PID}" | grep -q ensure_diskfree && ! uname | grep -q Darwin; then
add_tests test_ensurespace_move_file add_tests test_ensurespace_move_file
fi fi
add_tests test_write_data_with_skip add_tests test_write_data_with_skip