fix testing jobs out of scope tests regex to match against full name

Signed-off-by: nadav mizrahi <[email protected]>
noobaa · Apr 27, 2023 · df7510f · df7510f
1 parent f24d42a
commit df7510f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
@@ -71,6 +71,7 @@ s3tests_boto3.functional.test_headers.test_bucket_create_bad_date_invalid_aws2
 s3tests_boto3.functional.test_headers.test_bucket_create_bad_date_none_aws2
 s3tests_boto3.functional.test_headers.test_bucket_create_bad_date_empty_aws2
 s3tests_boto3.functional.test_headers.test_bucket_create_bad_date_before_epoch_aws2
+s3tests.functional.test_headers.test_object_acl_create_contentlength_none
 s3tests_boto3.functional.test_s3.test_bucket_listv2_delimiter_prefix
 s3tests_boto3.functional.test_s3.test_bucket_listv2_delimiter_prefix_underscore
 s3tests_boto3.functional.test_s3.test_bucket_list_delimiter_unreadable
@@ -163,6 +164,7 @@ s3tests_boto3.functional.test_s3.test_object_acl_canned_bucketownerread
 s3tests_boto3.functional.test_s3.test_object_acl_canned_authenticatedread
 s3tests_boto3.functional.test_s3.test_object_acl_canned_bucketownerfullcontrol
 s3tests_boto3.functional.test_s3.test_object_acl_full_control_verify_owner
+s3tests_boto3.functional.test_s3.test_object_acl_full_control_verify_attributes
 s3tests_boto3.functional.test_s3.test_object_acl
 s3tests_boto3.functional.test_s3.test_object_acl_write
 s3tests_boto3.functional.test_s3.test_object_acl_writeacp
@@ -178,7 +180,7 @@ s3tests_boto3.functional.test_s3.test_bucket_acl_no_grants
 s3tests_boto3.functional.test_s3.test_bucket_header_acl_grants
 s3tests_boto3.functional.test_s3.test_object_header_acl_grants
 s3tests_boto3.functional.test_s3.test_bucket_acl_grant_email
-s3tests_boto3.functional.test_s3.test_bucket_acl_grant_email_notexist
+s3tests_boto3.functional.test_s3.test_bucket_acl_grant_email_not_exist
 s3tests_boto3.functional.test_s3.test_bucket_acl_revoke_all
 s3tests_boto3.functional.test_s3.test_logging_toggle
 s3tests_boto3.functional.test_s3.test_access_bucket_private_object_private

diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
@@ -15,6 +15,13 @@ s3tests_boto3.functional.test_s3.test_post_object_missing_policy_condition
 s3tests_boto3.functional.test_s3.test_post_object_request_missing_policy_specified_field
 s3tests_boto3.functional.test_s3.test_post_object_expired_policy
 s3tests_boto3.functional.test_s3.test_post_object_invalid_request_field_value
+s3tests_boto3.functional.test_s3.test_lifecycle_get_no_id
+s3tests_boto3.functional.test_s3.test_object_lock_put_obj_lock_invalid_mode
+s3tests_boto3.functional.test_s3.test_object_lock_get_obj_retention_iso8601
+s3tests_boto3.functional.test_s3.test_object_lock_delete_object_with_retention_and_marker
+s3tests_boto3.functional.test_s3.test_multipart_upload_on_a_bucket_with_policy
+s3tests_boto3.functional.test_s3.test_multipart_upload_small
+s3tests_boto3.functional.test_s3.test_post_object_authenticated_request_bad_access_key
 s3tests_boto3.functional.test_s3.test_bucket_create_exists
 s3tests_boto3.functional.test_s3.test_bucket_create_exists_nonowner
 s3tests_boto3.functional.test_s3.test_bucket_recreate_overwrite_acl

diff --git a/src/test/system_tests/ceph_s3_tests/test_ceph_s3.js b/src/test/system_tests/ceph_s3_tests/test_ceph_s3.js
@@ -28,7 +28,7 @@ let tests_list;
 
 const OUT_OF_SCOPE_TESTS = create_out_of_scope_tests_list() || [];
 //Regexp match will be tested per each entry
-const S3_CEPH_TEST_OUT_OF_SCOPE_REGEXP = new RegExp(`(${OUT_OF_SCOPE_TESTS.join(')|(')})`);
+const S3_CEPH_TEST_OUT_OF_SCOPE_REGEXP = new RegExp(`(${OUT_OF_SCOPE_TESTS.join('\\b)|(')}\\b)`);
 const S3_CEPH_TEST_STEMS_REGEXP = new RegExp(`(${S3_CEPH_TEST_STEMS.join(')|(')})`);
 
 async function main() {