Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py

@@ -24,12 +24,11 @@ from base import TestAutomationBase
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(TestAutomationBase):
-    @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
+
     def test_C18977329_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform):
         from . import C18977329_NvCloth_AddClothSimulationToMesh as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
     def test_C18977330_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform):
         from . import C18977330_NvCloth_AddClothSimulationToActor as test_module
         self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt

@@ -13,13 +13,6 @@ add_subdirectory(asset_processor_tests)
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
 ## AP Python Tests ##
-    ly_add_pytest(
-        NAME AssetPipelineTests.AuxiliaryContent
-        PATH ${CMAKE_CURRENT_LIST_DIR}/auxiliary_content_tests/auxiliary_content_tests.py
-        EXCLUDE_TEST_RUN_TARGET_FROM_IDE
-        TEST_SUITE periodic
-    )
-
     ly_add_pytest(
         NAME AssetPipelineTests.BankInfoParser
         PATH ${CMAKE_CURRENT_LIST_DIR}/wwise_bank_dependency_tests/bank_info_parser_tests.py

AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/__init__.py

@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#

AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/auxiliary_content_tests.py

@@ -1,96 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-"""
-import pytest
-import ly_test_tools
-
-import os
-import sys
-import shutil
-import subprocess
-import glob
-from ly_test_tools.builtin.helpers import *
-from ly_test_tools.environment.process_utils import *
-from ly_test_tools.o3de.asset_processor import ASSET_PROCESSOR_PLATFORM_MAP
-
-logger = logging.getLogger(__name__)
-
-project_list = ['AutomatedTesting']
-
-@pytest.mark.system
-@pytest.mark.SUITE_periodic
-class TestAuxiliaryContent:
-    @pytest.fixture(autouse=True)
-    def setup_teardown(self, request, workspace, project):
-        path_to_dev = workspace.paths.engine_root()
-        os.chdir(path_to_dev)
-        auxiliaryContentDirName = str.lower(project) + f"_{ASSET_PROCESSOR_PLATFORM_MAP[workspace.asset_processor_platform]}_paks"
-        self.auxiliaryContentPath = os.path.join(path_to_dev, auxiliaryContentDirName)
-
-        def teardown():
-            if (os.path.exists(self.auxiliaryContentPath)):
-                shutil.rmtree(self.auxiliaryContentPath)
-
-        request.addfinalizer(teardown)
-
-    @staticmethod
-    def scanForLevelPak(path_toscan):
-        files = glob.glob('{0}/**/level.pak'.format(path_toscan), recursive=True)
-        return len(files)
-
-    @pytest.mark.parametrize('level', ['alldependencies'])
-    @pytest.mark.parametrize('project', project_list)
-    def test_CreateAuxiliaryContent_DontSkipLevelPaks(self, workspace, level):
-        """
-        This test ensure that Auxiliary Content contain level.pak files
-
-        Test Steps:
-        1. Run auxiliary content against project under test
-        2. Validate auxiliary content exists
-        3. Verifies that level.pak exists
-        """
-
-        path_to_dev = workspace.paths.engine_root()
-        bin_path = workspace.paths.build_directory()
-
-        auxiliaryContentScriptPath = os.path.join(path_to_dev, 'BuildReleaseAuxiliaryContent.py')
-        subprocess.check_call(['python', auxiliaryContentScriptPath,
-                               "--buildFolder={0}".format(bin_path),
-                               "--platforms=pc",
-                               f"--project-path={workspace.project}"])
-
-        assert os.path.exists(self.auxiliaryContentPath)
-        assert not self.scanForLevelPak(self.auxiliaryContentPath) == 0
-
-    @pytest.mark.parametrize('level', ['alldependencies'])
-    @pytest.mark.parametrize('project', project_list)
-    def test_CreateAuxiliaryContent_SkipLevelPaks(self, workspace, level):
-        """
-        This test ensure that Auxiliary Content contain no level.pak file
-
-        Test Steps:
-        1. Run auxiliary content against project under test with skiplevelPaks flag
-        2. Validate auxiliary content exists
-        3. Validate level.pak was added to auxiliary content
-        """
-
-        path_to_dev = workspace.paths.engine_root()
-        bin_path = workspace.paths.build_directory()
-
-        auxiliaryContentScriptPath = os.path.join(path_to_dev, 'BuildReleaseAuxiliaryContent.py')
-        subprocess.check_call(['python', auxiliaryContentScriptPath,
-                               "--buildFolder={0}".format(bin_path),
-                               "--platforms=pc",
-                               "--skiplevelPaks",
-                               f"--project-path={workspace.project}"])
-        assert os.path.exists(self.auxiliaryContentPath)
-
-        assert self.scanForLevelPak(self.auxiliaryContentPath) == 0

AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py

@@ -102,7 +102,7 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx():
     # 6) Check if multiple material slots show up under Materials section in the PhysX Collider component
     pte = collider_component.get_property_tree()
     def get_surface_count():
-        count = pte.get_container_count("Collider Configuration|Physics Material|Mesh Surfaces")
+        count = pte.get_container_count("Collider Configuration|Physics Materials|Slots")
         return count.GetValue()
 
     Report.result(

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py

@@ -93,11 +93,13 @@ class TestAutomation(TestAutomationBase):
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C4044457_Material_RestitutionCombine.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044457_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform):
         from . import C4044457_Material_RestitutionCombine as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C4044456_Material_FrictionCombine.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044456_Material_FrictionCombine(self, request, workspace, editor, launcher_platform):
         from . import C4044456_Material_FrictionCombine as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -194,6 +196,7 @@ class TestAutomation(TestAutomationBase):
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C18981526_Material_RestitutionCombinePriority.setreg_override', 'AutomatedTesting/Registry')
     def test_C18981526_Material_RestitutionCombinePriority(self, request, workspace, editor, launcher_platform):
         from . import C18981526_Material_RestitutionCombinePriority as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -229,6 +232,7 @@ class TestAutomation(TestAutomationBase):
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C18977601_Material_FrictionCombinePriority.setreg_override', 'AutomatedTesting/Registry')
     def test_C18977601_Material_FrictionCombinePriority(self, request, workspace, editor, launcher_platform):
         from . import C18977601_Material_FrictionCombinePriority as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -250,6 +254,7 @@ class TestAutomation(TestAutomationBase):
     @pytest.mark.xfail(
         reason="This test needs new physics asset with multiple materials to be more stable.")
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C4044697_Material_PerfaceMaterialValidation.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044697_Material_PerfaceMaterialValidation(self, request, workspace, editor, launcher_platform):
         from . import C4044697_Material_PerfaceMaterialValidation as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -282,6 +287,7 @@ class TestAutomation(TestAutomationBase):
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override', 'AutomatedTesting/Registry')
     def test_C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(self, request, workspace, editor, launcher_platform):
         from . import C15556261_PhysXMaterials_CharacterControllerMaterialAssignment as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -326,6 +332,7 @@ class TestAutomation(TestAutomationBase):
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
+    @fm.file_override('physxsystemconfiguration.setreg','C4044461_Material_Restitution.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044461_Material_Restitution(self, request, workspace, editor, launcher_platform):
         from . import C4044461_Material_Restitution as test_module
         self._run_test(request, workspace, editor, test_module)