aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2022-05-16 07:42:58 -0700
committerGitHub <noreply@github.com>2022-05-16 07:42:58 -0700
commit72e7dcde51d148494c2dcb734565f6681dba27fd (patch)
tree44a1313fbd86fd9662d90b25092f1be698bca979 /test
parenta84f4eefc23e1d9841908ba717d0606e414014ea (diff)
parentb72f0634d7d7d736cee96477852a8d36e89ac1cb (diff)
downloadseaweedfs-72e7dcde51d148494c2dcb734565f6681dba27fd.tar.xz
seaweedfs-72e7dcde51d148494c2dcb734565f6681dba27fd.zip
Merge pull request #3060 from natmaka/master
Diffstat (limited to 'test')
-rwxr-xr-xtest/s3/compatibility/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/s3/compatibility/run.sh b/test/s3/compatibility/run.sh
index 96d630dd7..990599df5 100755
--- a/test/s3/compatibility/run.sh
+++ b/test/s3/compatibility/run.sh
@@ -8,9 +8,9 @@ mkdir tmp
docker stop s3test-instance || echo "already stopped"
ulimit -n 10000
-../../../weed/weed server -filer -s3 -volume.max 0 -master.volumeSizeLimitMB 5 -dir "$(pwd)/tmp" 1>&2>weed.log &
+../../../weed/weed server -filer -s3 -volume.max 0 -master.volumeSizeLimitMB 5 -dir "$(pwd)/tmp" 1>&2>weed.log &
-until $(curl --output /dev/null --silent --head --fail http://127.0.0.1:9333); do
+until curl --output /dev/null --silent --head --fail http://127.0.0.1:9333; do
printf '.'
sleep 5
done
@@ -18,7 +18,7 @@ sleep 3
rm -Rf logs-full.txt logs-summary.txt
# docker run --name s3test-instance --rm -e S3TEST_CONF=s3tests.conf -v `pwd`/s3tests.conf:/s3-tests/s3tests.conf -it s3tests ./virtualenv/bin/nosetests s3tests_boto3/functional/test_s3.py:test_get_obj_tagging -v -a 'resource=object,!bucket-policy,!versioning,!encryption'
-docker run --name s3test-instance --rm -e S3TEST_CONF=s3tests.conf -v `pwd`/s3tests.conf:/s3-tests/s3tests.conf -it s3tests ./virtualenv/bin/nosetests s3tests_boto3/functional/test_s3.py -v -a 'resource=object,!bucket-policy,!versioning,!encryption' | sed -n -e '/botocore.hooks/!p;//q' | tee logs-summary.txt
+docker run --name s3test-instance --rm -e S3TEST_CONF=s3tests.conf -v "$(pwd)"/s3tests.conf:/s3-tests/s3tests.conf -it s3tests ./virtualenv/bin/nosetests s3tests_boto3/functional/test_s3.py -v -a 'resource=object,!bucket-policy,!versioning,!encryption' | sed -n -e '/botocore.hooks/!p;//q' | tee logs-summary.txt
docker stop s3test-instance || echo "already stopped"
killall -9 weed