Disable s3express test by default

awslabs · Dec 2, 2023 · e43c1ec · e43c1ec
1 parent de36fee
commit e43c1ec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ endif()
 option(ASSERT_LOCK_HELD "Enable ASSERT_SYNCED_DATA_LOCK_HELD for checking thread issue" OFF)
 option(ENABLE_MOCK_SERVER_TESTS "Whether to run the integration tests that rely on pre-configured mock server" OFF)
 option(ENABLE_MRAP_TESTS "Whether to run the integration tests that rely on pre-configured multi-region access point" OFF)
+option(ENABLE_S3EXPRESS_TESTS "Whether to run the integration tests that rely on pre-configured directory buckets" OFF)
 option(AWS_ENABLE_S3_ENDPOINT_RESOLVER "Whether to include the s3 endpoint resolver and related config files" OFF)
 
 if (ASSERT_LOCK_HELD)

diff --git a/builder.json b/builder.json
@@ -18,7 +18,8 @@
         "test"
     ],
     "+cmake_args": [
-        "-DENABLE_MRAP_TESTS=ON"
+        "-DENABLE_MRAP_TESTS=ON",
+        "-DENABLE_S3EXPRESS_TESTS=ON"
     ],
     "pre_build_steps": ["mock-server-setup"]
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -294,14 +294,16 @@ if(ENABLE_MOCK_SERVER_TESTS)
     add_net_test_case(request_time_too_skewed_mock_server)
 endif()
 
-add_net_test_case(s3express_provider_long_running_session_refresh)
-
-add_net_test_case(s3express_client_put_object)
-add_net_test_case(s3express_client_put_object_multipart)
-add_net_test_case(s3express_client_put_object_multipart_multiple)
-add_net_test_case(s3express_client_put_object_long_running_session_refresh)
-add_net_test_case(s3express_client_get_object)
-add_net_test_case(s3express_client_get_object_multiple)
+if(ENABLE_S3EXPRESS_TESTS)
+    add_net_test_case(s3express_provider_long_running_session_refresh)
+
+    add_net_test_case(s3express_client_put_object)
+    add_net_test_case(s3express_client_put_object_multipart)
+    add_net_test_case(s3express_client_put_object_multipart_multiple)
+    add_net_test_case(s3express_client_put_object_long_running_session_refresh)
+    add_net_test_case(s3express_client_get_object)
+    add_net_test_case(s3express_client_get_object_multiple)
+endif()
 
 add_net_test_case(meta_request_auto_ranged_get_new_error_handling)
 add_net_test_case(meta_request_auto_ranged_put_new_error_handling)

diff --git a/tests/test_helper/README.md b/tests/test_helper/README.md
@@ -50,6 +50,7 @@ You can specify the bucket name to be created either by passing argument to the
 * To run tests in tests/s3_mock_server_tests.c, initialize the mock S3 server first from [here](./../mock_s3_server/). And build your cmake project with `-DENABLE_MOCK_SERVER_TESTS=true`
 * Note: If you are not at the aws-common-runtime AWS team account, you must set environment variable `CRT_S3_TEST_BUCKET_NAME` to the bucket created before running the test.
 * When you see error with "Check your account level S3 settings, public access may be blocked.", Check https://docs.aws.amazon.com/AmazonS3/latest/userguide/configuring-block-public-access-account.html to set `BlockPublicAcls` to false, which enables public read of the object with `public-read` ACL in the bucket.
+* The S3express integration tests are not included in this script, and they are disabled by default.
 
 ## TODO