Merge pull request #498 from andrewgaul/s3proxy

Upgrade to S3Proxy 1.5.1

test/integration-test-common.sh

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

test/integration-test-main.sh

@@ -412,8 +412,7 @@ function add_all_tests {
     # TODO: broken: https://github.com/s3fs-fuse/s3fs-fuse/issues/145
     #add_tests test_rename_before_close
     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_symlink
     add_tests test_extended_attributes

test/s3proxy.conf

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