From ce2bff6af13f705eb77e4843edcbec3db1daa1b6 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 26 Aug 2023 11:02:03 -0700 Subject: [PATCH] Run tests with HTTP instead of HTTPS This reduces the s3fs CPU run-time dramatically. --- test/integration-test-common.sh | 6 +----- test/s3proxy.conf | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 6ab53f3..cca5207 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -72,11 +72,7 @@ S3FS=../src/s3fs # [NOTE] # CHAOS HTTP PROXY does not support HTTPS. # -if [ -z "${CHAOS_HTTP_PROXY}" ] && [ -z "${CHAOS_HTTP_PROXY_OPT}" ]; then - : "${S3_URL:="https://127.0.0.1:8080"}" -else - : "${S3_URL:="http://127.0.0.1:8080"}" -fi +: "${S3_URL:="http://127.0.0.1:8080"}" : "${S3_ENDPOINT:="us-east-1"}" : "${S3FS_CREDENTIALS_FILE:="passwd-s3fs"}" : "${TEST_BUCKET_1:="s3fs-integration-test"}" diff --git a/test/s3proxy.conf b/test/s3proxy.conf index 50ab754..a35f622 100644 --- a/test/s3proxy.conf +++ b/test/s3proxy.conf @@ -1,4 +1,4 @@ -s3proxy.secure-endpoint=https://127.0.0.1:8080 +s3proxy.endpoint=http://127.0.0.1:8080 s3proxy.authorization=aws-v2-or-v4 s3proxy.identity=local-identity s3proxy.credential=local-credential