diff options
Diffstat (limited to 'test/s3')
| -rw-r--r-- | test/s3/versioning/Makefile | 4 | ||||
| -rw-r--r-- | test/s3/versioning/s3_versioning_test.go | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/test/s3/versioning/Makefile b/test/s3/versioning/Makefile index d8608d283..ccf5e2092 100644 --- a/test/s3/versioning/Makefile +++ b/test/s3/versioning/Makefile @@ -222,13 +222,13 @@ test-with-server: start-server test-versioning-with-configs: check-deps @echo "Testing with different S3 configurations..." @echo "Testing with empty folder allowed..." - @$(WEED_BINARY) server -s3 -s3.port=$(S3_PORT) -s3.allowEmptyFolder=true -filer -master.volumeSizeLimitMB=1024 -volume.max=100 > weed-test-config1.log 2>&1 & echo $$! > weed-config1.pid + @$(WEED_BINARY) server -s3 -s3.port=$(S3_PORT) -s3.allowEmptyFolder=true -filer -master.volumeSizeLimitMB=100 -volume.max=100 > weed-test-config1.log 2>&1 & echo $$! > weed-config1.pid @sleep 5 @go test -v -timeout=5m -run "TestVersioningBasicWorkflow" . || true @if [ -f weed-config1.pid ]; then kill -TERM $$(cat weed-config1.pid) 2>/dev/null || true; rm -f weed-config1.pid; fi @sleep 2 @echo "Testing with delete bucket not empty disabled..." - @$(WEED_BINARY) server -s3 -s3.port=$(S3_PORT) -s3.allowDeleteBucketNotEmpty=false -filer -master.volumeSizeLimitMB=1024 -volume.max=100 > weed-test-config2.log 2>&1 & echo $$! > weed-config2.pid + @$(WEED_BINARY) server -s3 -s3.port=$(S3_PORT) -s3.allowDeleteBucketNotEmpty=false -filer -master.volumeSizeLimitMB=100 -volume.max=100 > weed-test-config2.log 2>&1 & echo $$! > weed-config2.pid @sleep 5 @go test -v -timeout=5m -run "TestVersioningBasicWorkflow" . || true @if [ -f weed-config2.pid ]; then kill -TERM $$(cat weed-config2.pid) 2>/dev/null || true; rm -f weed-config2.pid; fi diff --git a/test/s3/versioning/s3_versioning_test.go b/test/s3/versioning/s3_versioning_test.go index 79f027748..cb8d72535 100644 --- a/test/s3/versioning/s3_versioning_test.go +++ b/test/s3/versioning/s3_versioning_test.go @@ -164,6 +164,16 @@ func checkVersioningStatus(t *testing.T, client *s3.Client, bucketName string, e assert.Equal(t, expectedStatus, resp.Status) } +// checkVersioningStatusEmpty verifies that a bucket has no versioning configuration (newly created bucket) +func checkVersioningStatusEmpty(t *testing.T, client *s3.Client, bucketName string) { + resp, err := client.GetBucketVersioning(context.TODO(), &s3.GetBucketVersioningInput{ + Bucket: aws.String(bucketName), + }) + require.NoError(t, err) + // AWS S3 returns an empty versioning configuration (no Status field) for buckets that have never had versioning configured, such as newly created buckets. + assert.Empty(t, resp.Status, "Newly created bucket should have empty versioning status") +} + // putObject puts an object into a bucket func putObject(t *testing.T, client *s3.Client, bucketName, key, content string) *s3.PutObjectOutput { resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{ @@ -284,8 +294,9 @@ func TestVersioningBasicWorkflow(t *testing.T) { createBucket(t, client, bucketName) defer deleteBucket(t, client, bucketName) - // Initially, versioning should be suspended/disabled - checkVersioningStatus(t, client, bucketName, types.BucketVersioningStatusSuspended) + // Initially, versioning should be unset/empty (not suspended) for newly created buckets + // This matches AWS S3 behavior where new buckets have no versioning status + checkVersioningStatusEmpty(t, client, bucketName) // Enable versioning enableVersioning(t, client, bucketName) |