still use 1MB to avoid it took too long

Author: TingDaoK

tests/s3_data_plane_tests.c

@@ -1830,7 +1830,7 @@ static int s_test_s3_get_object_backpressure_helper(
     }
     /* Put together a simple S3 Get Object request. */
     struct aws_http_message *message =
-        aws_s3_test_get_object_request_new(allocator, host_cursor, g_pre_existing_object_10MB);
+        aws_s3_test_get_object_request_new(allocator, host_cursor, g_pre_existing_object_1MB);
 
     struct aws_signing_config_aws s3express_signing_config = {
         .algorithm = AWS_SIGNING_ALGORITHM_V4_S3EXPRESS,
@@ -1845,7 +1845,7 @@ static int s_test_s3_get_object_backpressure_helper(
     }
     struct aws_string *filepath_str = NULL;
     if (file_on_disk) {
-        filepath_str = aws_s3_tester_create_file(allocator, g_pre_existing_object_10MB, NULL);
+        filepath_str = aws_s3_tester_create_file(allocator, g_pre_existing_object_1MB, NULL);
         options.recv_filepath = aws_byte_cursor_from_string(filepath_str);
     }
 
@@ -1902,7 +1902,7 @@ static int s_test_s3_get_object_backpressure_small_increments(struct aws_allocat
     /* Test increments smaller than part-size.
      * Only 1 part at a time should be in flight */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size / 4;
@@ -1915,7 +1915,7 @@ static int s_test_s3_get_object_backpressure_big_increments(struct aws_allocator
     /* Test increments larger than part-size.
      * Multiple parts should be in flight at a time */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 8;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size * 3;
@@ -1927,7 +1927,7 @@ AWS_TEST_CASE(test_s3_get_object_backpressure_initial_size_zero, s_test_s3_get_o
 static int s_test_s3_get_object_backpressure_initial_size_zero(struct aws_allocator *allocator, void *ctx) {
     /* Test with initial window size of zero */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 0;
     uint64_t window_increment_size = part_size / 2;
@@ -1944,7 +1944,7 @@ static int s_test_s3_get_object_backpressure_small_increments_recv_filepath(
     /* Test increments smaller than part-size.
      * Only 1 part at a time should be in flight */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size / 2;
@@ -1959,7 +1959,7 @@ static int s_test_s3_get_object_backpressure_big_increments_recv_filepath(struct
     /* Test increments larger than part-size.
      * Multiple parts should be in flight at a time */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 8;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size * 3;
@@ -1975,7 +1975,7 @@ static int s_test_s3_get_object_backpressure_initial_size_zero_recv_filepath(
     void *ctx) {
     /* Test with initial window size of zero */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 0;
     uint64_t window_increment_size = part_size / 2;
@@ -1990,7 +1990,7 @@ static int s_test_s3_get_object_backpressure_small_increments_s3express(struct a
     /* Test increments smaller than part-size with S3 Express.
      * Only 1 part at a time should be in flight */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size / 4;
@@ -2005,7 +2005,7 @@ static int s_test_s3_get_object_backpressure_big_increments_s3express(struct aws
     /* Test increments larger than part-size with S3 Express.
      * Multiple parts should be in flight at a time */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 8;
     size_t window_initial_size = 1024;
     uint64_t window_increment_size = part_size * 3;
@@ -2019,7 +2019,7 @@ AWS_TEST_CASE(
 static int s_test_s3_get_object_backpressure_initial_size_s3express(struct aws_allocator *allocator, void *ctx) {
     /* Test with initial window size of zero with S3 Express */
     (void)ctx;
-    size_t file_size = 10 * 1024 * 1024; /* Test downloads 10MB file */
+    size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 0;
     uint64_t window_increment_size = part_size / 2;

tests/test_helper/README.md

@@ -48,13 +48,15 @@ python3 test_helper.py clean
   + Add the lifecycle to automatic clean up the `upload/` and clean up incomplete multipart uploads after one day.
   + Upload files:
     - `pre-existing-10MB` 10MB file.
+    - `pre-existing-1MB` 1MB file.
     - with `--large_objects` enabled
       - `pre-existing-2GB`
 
 * Create directory bucket `<BUCKET_NAME>--use1-az4--x-s3` in us-east-1
   + Add the lifecycle to automatic clean up the `upload/` and clean up incomplete multipart uploads after one day.
   + Upload files:
     - `pre-existing-10MB` 10MB file.
+    - `pre-existing-1MB` 1MB file.
     - with `--large_objects` enabled
       - `pre-existing-2GB`
 

tests/test_helper/test_helper.py

@@ -189,6 +189,8 @@ def create_bucket_with_lifecycle(availability_zone=None, client=s3_client, regio
 
     put_pre_existing_objects(
         10*MB, 'pre-existing-10MB', bucket=bucket_name, client=client)
+    put_pre_existing_objects(
+        1*MB, 'pre-existing-1MB', bucket=bucket_name, client=client)
 
     if args.large_objects:
         put_pre_existing_objects(
@@ -201,8 +203,6 @@ def create_bucket_with_lifecycle(availability_zone=None, client=s3_client, regio
             10*MB, 'pre-existing-10MB-aes256', sse='aes256', bucket=bucket_name)
         put_pre_existing_objects(
             10*MB, 'pre-existing-10MB-kms', sse='kms', bucket=bucket_name)
-        put_pre_existing_objects(
-            1*MB, 'pre-existing-1MB', bucket=bucket_name)
         put_pre_existing_objects(
             1*MB, 'pre-existing-1MB-@', bucket=bucket_name)
         put_pre_existing_objects(