Merge branch 'development' into Atom/dmcdiar/ATOM-4126

AutomatedTesting/Gem/PythonTests/AWS/README.md

@@ -8,19 +8,21 @@
 ## Deploy CDK Applications
 1. Go to the AWS IAM console and create an IAM role called o3de-automation-tests which adds your own account as as a trusted entity and uses the "AdministratorAccess" permissions policy.
 2. Copy {engine_root}\scripts\build\Platform\Windows\deploy_cdk_applications.cmd to your engine root folder.
-3. Open a Command Prompt window at the engine root and set the following environment variables:  
-   Set O3DE_AWS_PROJECT_NAME=AWSAUTO  
-   Set O3DE_AWS_DEPLOY_REGION=us-east-1  
-   Set ASSUME_ROLE_ARN="arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests"  
-   Set COMMIT_ID=HEAD  
-4. Deploy the CDK applications for AWS gems by running deploy_cdk_applications.cmd in the same Command Prompt window.
-5. Edit AWS\common\constants.py to replace the assume role ARN with your own:  
-   arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests
+3. Open a new Command Prompt window at the engine root and set the following environment variables:  
+   Set O3DE_AWS_PROJECT_NAME=AWSAUTO
+   Set O3DE_AWS_DEPLOY_REGION=us-east-1
+   Set ASSUME_ROLE_ARN=arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests
+   Set COMMIT_ID=HEAD
+4. In the same Command Prompt window, Deploy the CDK applications for AWS gems by running deploy_cdk_applications.cmd.
    
 ## Run Automation Tests
 ### CLI
-Open a Command Prompt window at the engine root and run the following CLI command:  
+In the same Command Prompt window, run the following CLI command:  
 python\python.cmd -m pytest {path_to_the_test_file} --build-directory {directory_to_the_profile_build}
 
 ### Pycharm
-You can also run any specific automation test directly from Pycharm by providing the "--build-directory" argument in the Run Configuration.
+You can also run any specific automation test directly from Pycharm by providing the "--build-directory" argument in the Run Configuration.
+
+## Destroy CDK Applications
+1. Copy {engine_root}\scripts\build\Platform\Windows\destroy_cdk_applications.cmd to your engine root folder.
+2. In the same Command Prompt window, destroy the CDK applications for AWS gems by running destroy_cdk_applications.cmd.

AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py

@@ -139,7 +139,6 @@ def update_kinesis_analytics_application_status(aws_metrics_utils: pytest.fixtur
 @pytest.mark.usefixtures('resource_mappings')
 @pytest.mark.parametrize('assume_role_arn', [constants.ASSUME_ROLE_ARN])
 @pytest.mark.parametrize('feature_name', [AWS_METRICS_FEATURE_NAME])
-@pytest.mark.parametrize('level', ['AWS/Metrics'])
 @pytest.mark.parametrize('profile_name', ['AWSAutomationTest'])
 @pytest.mark.parametrize('project', ['AutomatedTesting'])
 @pytest.mark.parametrize('region_name', [constants.AWS_REGION])
@@ -150,6 +149,7 @@ class TestAWSMetricsWindows(object):
     """
     Test class to verify the real-time and batch analytics for metrics.
     """
+    @pytest.mark.parametrize('level', ['AWS/Metrics'])
     def test_realtime_and_batch_analytics(self,
                                           level: str,
                                           launcher: pytest.fixture,
@@ -167,10 +167,6 @@ class TestAWSMetricsWindows(object):
                                                                 args=(aws_metrics_utils, resource_mappings, True))
         kinesis_analytics_application_thread.start()
 
-        # Clear the analytics bucket objects before sending new metrics.
-        aws_metrics_utils.empty_bucket(
-            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName'))
-
         log_monitor = setup(launcher, asset_processor)
 
         # Kinesis analytics application needs to be in the running state before we start the game launcher.
@@ -205,6 +201,7 @@ class TestAWSMetricsWindows(object):
         for thread in operational_threads:
             thread.join()
 
+    @pytest.mark.parametrize('level', ['AWS/Metrics'])
     def test_unauthorized_user_request_rejected(self,
                                                 level: str,
                                                 launcher: pytest.fixture,
@@ -227,3 +224,13 @@ class TestAWSMetricsWindows(object):
                 halt_on_unexpected=True)
             assert result, 'Metrics events are sent successfully by unauthorized user'
             logger.info('Unauthorized user is rejected to send metrics.')
+
+    def test_clean_up_s3_bucket(self,
+                                aws_utils: pytest.fixture,
+                                resource_mappings: pytest.fixture,
+                                aws_metrics_utils: pytest.fixture):
+        """
+        Clear the analytics bucket objects so that the S3 bucket can be destroyed during tear down.
+        """
+        aws_metrics_utils.empty_bucket(
+            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName'))

AutomatedTesting/Gem/PythonTests/CMakeLists.txt

@@ -21,7 +21,7 @@ add_subdirectory(assetpipeline)
 add_subdirectory(atom_renderer)
 
 ## Physics ##
-add_subdirectory(physics)
+add_subdirectory(Physics)
 
 ## ScriptCanvas ##
 add_subdirectory(scripting)