From dcd1b1121a675268abf84b17e45a7d8cd565e198 Mon Sep 17 00:00:00 2001 From: sansns-aws <107269923+sansns@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:31:19 -0400 Subject: [PATCH] chore(codebuild): Cleanup tests (#5567) --- .../codebuild_project_older_90_days_test.py | 16 ++++++++----- ..._project_user_controlled_buildspec_test.py | 24 +++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/tests/providers/aws/services/codebuild/codebuild_project_older_90_days/codebuild_project_older_90_days_test.py b/tests/providers/aws/services/codebuild/codebuild_project_older_90_days/codebuild_project_older_90_days_test.py index 7b9eac46ed..0f269280cc 100644 --- a/tests/providers/aws/services/codebuild/codebuild_project_older_90_days/codebuild_project_older_90_days_test.py +++ b/tests/providers/aws/services/codebuild/codebuild_project_older_90_days/codebuild_project_older_90_days_test.py @@ -1,5 +1,4 @@ from datetime import datetime, timedelta, timezone -from re import search from unittest import mock from prowler.providers.aws.services.codebuild.codebuild_service import Project @@ -40,8 +39,9 @@ class Test_codebuild_project_older_90_days: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "has not been invoked in the last 90 days", result[0].status_extended + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} has not been invoked in the last 90 days." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn @@ -79,7 +79,10 @@ class Test_codebuild_project_older_90_days: assert len(result) == 1 assert result[0].status == "FAIL" - assert search("has never been built", result[0].status_extended) + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} has never been built." + ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn assert result[0].resource_tags == [] @@ -116,8 +119,9 @@ class Test_codebuild_project_older_90_days: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has been invoked in the last 90 days", result[0].status_extended + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} has been invoked in the last 90 days." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn diff --git a/tests/providers/aws/services/codebuild/codebuild_project_user_controlled_buildspec/codebuild_project_user_controlled_buildspec_test.py b/tests/providers/aws/services/codebuild/codebuild_project_user_controlled_buildspec/codebuild_project_user_controlled_buildspec_test.py index d1a306b263..331bc5f3f5 100644 --- a/tests/providers/aws/services/codebuild/codebuild_project_user_controlled_buildspec/codebuild_project_user_controlled_buildspec_test.py +++ b/tests/providers/aws/services/codebuild/codebuild_project_user_controlled_buildspec/codebuild_project_user_controlled_buildspec_test.py @@ -1,4 +1,3 @@ -from re import search from unittest import mock from prowler.providers.aws.services.codebuild.codebuild_service import Project @@ -38,9 +37,9 @@ class Test_codebuild_project_user_controlled_buildspec: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "does not use an user controlled buildspec", - result[0].status_extended, + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} does not use an user controlled buildspec." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn @@ -78,9 +77,9 @@ class Test_codebuild_project_user_controlled_buildspec: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "does not use an user controlled buildspec", - result[0].status_extended, + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} does not use an user controlled buildspec." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn @@ -117,8 +116,9 @@ class Test_codebuild_project_user_controlled_buildspec: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "uses an user controlled buildspec", result[0].status_extended + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} uses an user controlled buildspec." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn @@ -155,9 +155,9 @@ class Test_codebuild_project_user_controlled_buildspec: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "does not use an user controlled buildspec", - result[0].status_extended, + assert ( + result[0].status_extended + == f"CodeBuild project {project_name} does not use an user controlled buildspec." ) assert result[0].resource_id == project_name assert result[0].resource_arn == project_arn