mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-12-24 01:35:26 +00:00
Merge pull request #1035 from gaul/test/flags
Individually test multiple s3fs flags
This commit is contained in:
commit
1cd58d7828
@ -983,6 +983,9 @@ static int do_create_bucket()
|
|||||||
// retry to check
|
// retry to check
|
||||||
s3fscurl.DestroyCurlHandle();
|
s3fscurl.DestroyCurlHandle();
|
||||||
res = s3fscurl.PutRequest("/", meta, tmpfd);
|
res = s3fscurl.PutRequest("/", meta, tmpfd);
|
||||||
|
}else if(responseCode == 409){
|
||||||
|
// bucket already exists
|
||||||
|
res = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(ptmpfp != NULL){
|
if(ptmpfp != NULL){
|
||||||
|
@ -135,7 +135,6 @@ function stop_s3proxy {
|
|||||||
# Mount the bucket, function arguments passed to s3fs in addition to
|
# Mount the bucket, function arguments passed to s3fs in addition to
|
||||||
# a set of common arguments.
|
# a set of common arguments.
|
||||||
function start_s3fs {
|
function start_s3fs {
|
||||||
|
|
||||||
# Public bucket if PUBLIC is set
|
# Public bucket if PUBLIC is set
|
||||||
if [ -n "${PUBLIC}" ]; then
|
if [ -n "${PUBLIC}" ]; then
|
||||||
AUTH_OPT="-o public_bucket=1"
|
AUTH_OPT="-o public_bucket=1"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
s3proxy.secure-endpoint=https://127.0.0.1:8080
|
s3proxy.secure-endpoint=https://127.0.0.1:8080
|
||||||
s3proxy.authorization=aws-v4
|
s3proxy.authorization=aws-v2-or-v4
|
||||||
s3proxy.identity=local-identity
|
s3proxy.identity=local-identity
|
||||||
s3proxy.credential=local-credential
|
s3proxy.credential=local-credential
|
||||||
s3proxy.keystore-path=keystore.jks
|
s3proxy.keystore-path=keystore.jks
|
||||||
|
@ -12,19 +12,33 @@ REQUIRE_ROOT=require-root.sh
|
|||||||
|
|
||||||
source integration-test-common.sh
|
source integration-test-common.sh
|
||||||
|
|
||||||
|
CACHE_DIR="/tmp/s3fs-cache"
|
||||||
|
rm -rf "${CACHE_DIR}"
|
||||||
|
mkdir "${CACHE_DIR}"
|
||||||
|
|
||||||
|
FLAGS=(
|
||||||
|
enable_content_md5
|
||||||
|
nocopyapi
|
||||||
|
nomultipart
|
||||||
|
notsup_compat_dir
|
||||||
|
sigv2
|
||||||
|
singlepart_copy_limit=$((10 * 1024)) # limit size to exercise multipart code paths
|
||||||
|
use_cache="${CACHE_DIR}"
|
||||||
|
#use_sse # TODO: S3Proxy does not support SSE
|
||||||
|
)
|
||||||
|
|
||||||
start_s3proxy
|
start_s3proxy
|
||||||
|
|
||||||
#
|
for flag in ${FLAGS[*]}; do
|
||||||
# enable_content_md5
|
echo "testing s3fs flag: $flag"
|
||||||
# Causes s3fs to validate file contents. This isn't included in the common
|
|
||||||
# options used by start_s3fs because tests may be performance tests
|
|
||||||
# singlepart_copy_limit
|
|
||||||
# Appeared in upstream s3fs-fuse tests, possibly a limitation of S3Proxy
|
|
||||||
# TODO: github archaeology to see why it was added.
|
|
||||||
#
|
|
||||||
start_s3fs -o enable_content_md5 \
|
|
||||||
-o singlepart_copy_limit=$((10 * 1024))
|
|
||||||
|
|
||||||
./integration-test-main.sh
|
start_s3fs -o $flag
|
||||||
|
|
||||||
|
./integration-test-main.sh
|
||||||
|
|
||||||
|
stop_s3fs
|
||||||
|
done
|
||||||
|
|
||||||
|
stop_s3proxy
|
||||||
|
|
||||||
echo "$0: tests complete."
|
echo "$0: tests complete."
|
||||||
|
Loading…
Reference in New Issue
Block a user