test: skips removal

versity · Nov 22, 2024 · 1316864 · 1316864
1 parent bacd85c
commit 1316864
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/tests/test_common_acl.sh b/tests/test_common_acl.sh
@@ -15,10 +15,11 @@
 # under the License.
 
 test_put_bucket_acl_s3cmd() {
-  run setup_bucket "s3cmd" "$BUCKET_ONE_NAME"
-  assert_success
+  if [ "$DIRECT" != "true" ]; then
+    skip "https://github.com/versity/versitygw/issues/963"
+  fi
 
-  run put_bucket_ownership_controls "$BUCKET_ONE_NAME" "BucketOwnerPreferred"
+  run setup_bucket "s3cmd" "$BUCKET_ONE_NAME"
   assert_success
 
   username=$USERNAME_ONE

diff --git a/tests/test_s3api_bucket.sh b/tests/test_s3api_bucket.sh
@@ -76,10 +76,6 @@ export RUN_USERS=true
 
 # get-bucket-acl
 @test "test_get_bucket_acl" {
-  # TODO remove when able to assign bucket ownership back to root
-  if [[ $RECREATE_BUCKETS == "false" ]]; then
-    skip
-  fi
   run setup_bucket "s3api" "$BUCKET_ONE_NAME"
   assert_success
 

diff --git a/tests/test_s3api_root_inner.sh b/tests/test_s3api_root_inner.sh
@@ -120,8 +120,7 @@ test_get_object_attributes_s3api_root() {
 
 test_get_put_object_legal_hold_s3api_root() {
   if [[ $RECREATE_BUCKETS == "false" ]]; then
-    # https://github.com/versity/versitygw/issues/716
-    skip
+    skip "https://github.com/versity/versitygw/issues/716"
   fi
 
   bucket_file="bucket_file"
@@ -164,8 +163,7 @@ test_get_put_object_retention_s3api_root() {
   secret_key=$PASSWORD_ONE
 
   if [[ $RECREATE_BUCKETS == "false" ]]; then
-    # https://github.com/versity/versitygw/issues/716
-    skip
+    skip "https://github.com/versity/versitygw/issues/716"
   fi
 
   run legal_hold_retention_setup "$username" "$secret_key" "$bucket_file"
@@ -201,8 +199,7 @@ test_get_put_object_retention_s3api_root() {
 
 test_retention_bypass_s3api_root() {
   if [[ $RECREATE_BUCKETS == "false" ]]; then
-    # https://github.com/versity/versitygw/issues/716
-    skip
+    skip "https://github.com/versity/versitygw/issues/716"
   fi
   bucket_file="bucket_file"
   username=$USERNAME_ONE

diff --git a/tests/util/util_acl.sh b/tests/util/util_acl.sh
@@ -44,6 +44,7 @@ get_check_post_change_acl_s3cmd() {
   log 5 "ACL after read put: $acl"
   acl_lines=$(echo "$acl" | grep "ACL")
   log 5 "ACL lines:  $acl_lines"
+  lines=()
   while IFS= read -r line; do
     lines+=("$line")
   done <<< "$acl_lines"