test: remove some skips

versity · Jan 3, 2025 · ed15dfb · ed15dfb
1 parent 198c16b
commit ed15dfb
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 24 deletions.
diff --git a/tests/setup.sh b/tests/setup.sh
@@ -14,9 +14,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-load ./bats-support/load
-load ./bats-assert/load
-
 source ./tests/env.sh
 source ./tests/report.sh
 source ./tests/setup_mc.sh
@@ -68,11 +65,14 @@ delete_temp_log_if_exists() {
 # bats teardown function
 teardown() {
   # shellcheck disable=SC2154
-  if ! bucket_cleanup_if_bucket_exists "s3api" "$BUCKET_ONE_NAME"; then
-    log 3 "error deleting bucket $BUCKET_ONE_NAME or contents"
-  fi
-  if ! bucket_cleanup_if_bucket_exists "s3api" "$BUCKET_TWO_NAME"; then
-    log 3 "error deleting bucket $BUCKET_TWO_NAME or contents"
+  if [ "$DELETE_BUCKETS_AFTER_TEST" != "false" ]; then
+    log 5 "deleting or clearing buckets"
+    if ! bucket_cleanup_if_bucket_exists "s3api" "$BUCKET_ONE_NAME"; then
+      log 3 "error deleting bucket $BUCKET_ONE_NAME or contents"
+    fi
+    if ! bucket_cleanup_if_bucket_exists "s3api" "$BUCKET_TWO_NAME"; then
+      log 3 "error deleting bucket $BUCKET_TWO_NAME or contents"
+    fi
   fi
   if user_exists "$USERNAME_ONE" && ! delete_user "$USERNAME_ONE"; then
     log 3 "error deleting user $USERNAME_ONE"

diff --git a/tests/teardown_static.sh b/tests/teardown_static.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2024 Versity Software
 # This file is licensed under the Apache License, Version 2.0
@@ -21,12 +21,14 @@ if ! base_setup; then
   log 2 "error starting versity to set up static buckets"
   exit 1
 fi
-if ! delete_bucket_recursive "s3" "$BUCKET_ONE_NAME"; then
-  log 2 "error creating static bucket one"
-elif ! delete_bucket_recursive "s3" "$BUCKET_TWO_NAME"; then
-  log 2 "error creating static bucket two"
+#if ! delete_bucket_recursive "s3api" "$BUCKET_ONE_NAME"; then
+if ! clear_bucket_s3api "$BUCKET_ONE_NAME"; then
+  log 2 "error deleting static bucket one"
+elif ! delete_bucket_recursive "s3api" "$BUCKET_TWO_NAME"; then
+  log 2 "error deleting static bucket two"
+else
+  log 4 "buckets deleted successfully"
 fi
-log 4 "buckets deleted successfully"
 if ! stop_versity; then
   log 2 "error stopping versity"
 fi
diff --git a/tests/test_mc.sh b/tests/test_mc.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_common.sh
 source ./tests/setup.sh
 source ./tests/util/util_create_bucket.sh

diff --git a/tests/test_mc_file_count.sh b/tests/test_mc_file_count.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_common.sh
 
 export RUN_MC=true

diff --git a/tests/test_rest.sh b/tests/test_rest.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/commands/create_multipart_upload.sh
 source ./tests/commands/delete_object_tagging.sh
 source ./tests/commands/get_bucket_versioning.sh
@@ -383,9 +386,6 @@ export RUN_USERS=true
 }
 
 @test "REST - bucket tagging - tags" {
-  if [ "$DIRECT" != "true" ]; then
-    skip "https://github.com/versity/versitygw/issues/932"
-  fi
   test_key="testKey"
   test_value="testValue"
 

diff --git a/tests/test_rest_acl.sh b/tests/test_rest_acl.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/commands/put_object.sh
 source ./tests/logger.sh
 source ./tests/setup.sh
@@ -23,9 +26,6 @@ source ./tests/util/util_acl.sh
 export RUN_USERS=true
 
 @test "REST - get ACL" {
-  if [ "$DIRECT" != "true" ]; then
-    skip "https://github.com/versity/versitygw/issues/971"
-  fi
   run setup_bucket "s3api" "$BUCKET_ONE_NAME"
   assert_success
 

diff --git a/tests/test_s3.sh b/tests/test_s3.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_common.sh
 source ./tests/util/util_file.sh
 

diff --git a/tests/test_s3_file_count.sh b/tests/test_s3_file_count.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_common.sh
 source ./tests/util/util_file.sh
 

diff --git a/tests/test_s3api_bucket.sh b/tests/test_s3api_bucket.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/setup.sh
 source ./tests/util/util.sh
 source ./tests/util/util_create_bucket.sh

diff --git a/tests/test_s3api_multipart.sh b/tests/test_s3api_multipart.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/setup.sh
 source ./tests/test_s3api_root_inner.sh
 source ./tests/util/util_file.sh

diff --git a/tests/test_s3api_object.sh b/tests/test_s3api_object.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/setup.sh
 source ./tests/util/util.sh
 source ./tests/util/util_create_bucket.sh

diff --git a/tests/test_s3api_policy.sh b/tests/test_s3api_policy.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/logger.sh
 source ./tests/setup.sh
 source ./tests/test_s3api_policy_bucket.sh

diff --git a/tests/test_s3cmd.sh b/tests/test_s3cmd.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/setup.sh
 source ./tests/test_common.sh
 source ./tests/test_common_acl.sh

diff --git a/tests/test_s3cmd_file_count.sh b/tests/test_s3cmd_file_count.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_common.sh
 
 export RUN_S3CMD=true

diff --git a/tests/test_user_aws.sh b/tests/test_user_aws.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_user_common.sh
 source ./tests/util/util_users.sh
 source ./tests/commands/get_object.sh

diff --git a/tests/test_user_s3cmd.sh b/tests/test_user_s3cmd.sh
@@ -14,6 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+load ./bats-support/load
+load ./bats-assert/load
+
 source ./tests/test_user_common.sh
 
 export RUN_S3CMD=true

diff --git a/tests/util/util_bucket.sh b/tests/util/util_bucket.sh
@@ -217,10 +217,6 @@ bucket_cleanup_if_bucket_exists() {
   fi
 
   if [ "$3" == "true" ] || bucket_exists "$1" "$2"; then
-    if [ "$DELETE_BUCKETS_AFTER_TEST" == "false" ]; then
-      log 2 "skipping bucket cleanup/deletion"
-      return 0
-    fi
     if ! bucket_cleanup "$1" "$2"; then
       log 2 "error deleting bucket and/or contents"
       return 1