octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-22 16:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes to integration tests

Browse Source 
Use S3Proxy pid instead of self pid, ensure correct passwd
permissions, and use fusermount instead of umount so that non-root can
run tests.
This commit is contained in:
Andrew Gaul 2015-03-02 14:14:40 -08:00
parent 2f8ad7ace8
commit 0f7d77d599
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ then
echo "Missing credentials file: $S3FS_CREDENTIALS_FILE"
exit 1
fi
chmod 600 "$S3FS_CREDENTIALS_FILE"
S3PROXY_VERSION="1.3.0"
S3PROXY_BINARY="s3proxy-${S3PROXY_VERSION}-jar-with-dependencies.jar"

4
test/small-integration-test.sh
View File

@ -6,7 +6,7 @@ REQUIRE_ROOT=require-root.sh
source integration-test-common.sh
java -jar "$S3PROXY_BINARY" --properties s3proxy.conf &
S3PROXY_PID="$?"
S3PROXY_PID="$!"
# wait for S3Proxy to start
for i in $(seq 30);
@ -34,7 +34,7 @@ $S3FS $TEST_BUCKET_1 $TEST_BUCKET_MOUNT_POINT_1 \
./integration-test-main.sh $TEST_BUCKET_MOUNT_POINT_1
umount $TEST_BUCKET_MOUNT_POINT_1
fusermount -u $TEST_BUCKET_MOUNT_POINT_1
kill $S3PROXY_PID