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

Merge pull request #498 from andrewgaul/s3proxy

Browse Source 
Upgrade to S3Proxy 1.5.1
This commit is contained in:
Takeshi Nakatani 2016-11-20 05:44:07 +09:00 committed by GitHub
commit 5e4bafeab7
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration-test-common.sh
View File

@ -50,7 +50,7 @@ export S3_URL
export TEST_SCRIPT_DIR=`pwd` export TEST_SCRIPT_DIR=`pwd`
export TEST_BUCKET_MOUNT_POINT_1=${TEST_BUCKET_1} export TEST_BUCKET_MOUNT_POINT_1=${TEST_BUCKET_1}
S3PROXY_VERSION="1.4.0" S3PROXY_VERSION="1.5.1"
S3PROXY_BINARY=${S3PROXY_BINARY-"s3proxy-${S3PROXY_VERSION}"} S3PROXY_BINARY=${S3PROXY_BINARY-"s3proxy-${S3PROXY_VERSION}"}
if [ ! -f "$S3FS_CREDENTIALS_FILE" ] if [ ! -f "$S3FS_CREDENTIALS_FILE" ]
@ -157,8 +157,6 @@ function start_s3fs {
# #
# TODO: Allow all these options to be overriden with env variables # TODO: Allow all these options to be overriden with env variables
# #
# sigv2
# Historically because S3Proxy only supports sigv2.
# use_path_request_style # use_path_request_style
# The test env doesn't have virtual hosts # The test env doesn't have virtual hosts
# createbucket # createbucket
@ -181,7 +179,6 @@ function start_s3fs {
${VALGRIND_EXEC} ${S3FS} \ ${VALGRIND_EXEC} ${S3FS} \
$TEST_BUCKET_1 \ $TEST_BUCKET_1 \
$TEST_BUCKET_MOUNT_POINT_1 \ $TEST_BUCKET_MOUNT_POINT_1 \
-o sigv2 \
-o use_path_request_style \ -o use_path_request_style \
-o url=${S3_URL} \ -o url=${S3_URL} \
-o createbucket \ -o createbucket \

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

@ -412,8 +412,7 @@ function add_all_tests {
# TODO: broken: https://github.com/s3fs-fuse/s3fs-fuse/issues/145 # TODO: broken: https://github.com/s3fs-fuse/s3fs-fuse/issues/145
#add_tests test_rename_before_close #add_tests test_rename_before_close
add_tests test_multipart_upload add_tests test_multipart_upload
# TODO: test disabled until S3Proxy 1.5.0 is released add_tests test_multipart_copy
#add_tests test_multipart_copy
add_tests test_special_characters add_tests test_special_characters
add_tests test_symlink add_tests test_symlink
add_tests test_extended_attributes add_tests test_extended_attributes

2
test/s3proxy.conf
View File

@ -1,5 +1,5 @@
s3proxy.endpoint=http://127.0.0.1:8080 s3proxy.endpoint=http://127.0.0.1:8080
s3proxy.authorization=aws-v2 s3proxy.authorization=aws-v4
s3proxy.identity=local-identity s3proxy.identity=local-identity
s3proxy.credential=local-credential s3proxy.credential=local-credential