From 711cf13e74de6745dc572cf83f59e8c108641941 Mon Sep 17 00:00:00 2001 From: oyongzhi <48530933+oyongzhi@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:21:30 +0100 Subject: [PATCH 1/4] To test AR: Reduced joint swing limit Z by 0.01. --- Gems/PhysX/Code/Source/Joint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/PhysX/Code/Source/Joint.h b/Gems/PhysX/Code/Source/Joint.h index 5833b0e20f..4bb0c521fb 100644 --- a/Gems/PhysX/Code/Source/Joint.h +++ b/Gems/PhysX/Code/Source/Joint.h @@ -27,7 +27,7 @@ namespace PhysX const char* GetTypeName() override; float m_swingLimitY = 45.0f; ///< Maximum angle in degrees from the Y axis of the joint frame. - float m_swingLimitZ = 45.0f; ///< Maximum angle in degrees from the Z axis of the joint frame. + float m_swingLimitZ = 44.99f; ///< Maximum angle in degrees from the Z axis of the joint frame. float m_twistLimitLower = -45.0f; ///< Lower limit in degrees for rotation about the X axis of the joint frame. float m_twistLimitUpper = 45.0f; ///< Upper limit in degrees for rotation about the X axis of the joint frame. }; From 5ae3ec289472a90ca009e55b6efb5032994963aa Mon Sep 17 00:00:00 2001 From: oyongzhi Date: Thu, 1 Apr 2021 15:15:05 +0100 Subject: [PATCH 2/4] Restore Joint swing limit Z to 45.0f. --- Gems/PhysX/Code/Source/Joint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/PhysX/Code/Source/Joint.h b/Gems/PhysX/Code/Source/Joint.h index 4bb0c521fb..5833b0e20f 100644 --- a/Gems/PhysX/Code/Source/Joint.h +++ b/Gems/PhysX/Code/Source/Joint.h @@ -27,7 +27,7 @@ namespace PhysX const char* GetTypeName() override; float m_swingLimitY = 45.0f; ///< Maximum angle in degrees from the Y axis of the joint frame. - float m_swingLimitZ = 44.99f; ///< Maximum angle in degrees from the Z axis of the joint frame. + float m_swingLimitZ = 45.0f; ///< Maximum angle in degrees from the Z axis of the joint frame. float m_twistLimitLower = -45.0f; ///< Lower limit in degrees for rotation about the X axis of the joint frame. float m_twistLimitUpper = 45.0f; ///< Upper limit in degrees for rotation about the X axis of the joint frame. }; From fbeb728a6104b7405544c54774bc00a67814d62b Mon Sep 17 00:00:00 2001 From: oyongzhi Date: Thu, 1 Apr 2021 15:17:40 +0100 Subject: [PATCH 3/4] Move flaky AssetPipelineTests.Batch_2_Main to sandbox --- .../assetpipeline/asset_processor_tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt index 41eb13bf4c..5d4f96c92a 100644 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt @@ -24,7 +24,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_pytest( NAME AssetPipelineTests.Batch_2_Main - TEST_SUITE main + TEST_SUITE sandbox PATH ${CMAKE_CURRENT_LIST_DIR}/asset_processor_batch_tests_2.py EXCLUDE_TEST_RUN_TARGET_FROM_IDE RUNTIME_DEPENDENCIES From 7dfc79faa0d87f9d231ad7d4a71318ae15838a5b Mon Sep 17 00:00:00 2001 From: oyongzhi Date: Thu, 1 Apr 2021 15:49:11 +0100 Subject: [PATCH 4/4] Move Batch_2_main test block back to main from sandbox. Move single FastScaneWorks_FasterThanFullScan test to sandbox. --- .../assetpipeline/asset_processor_tests/CMakeLists.txt | 2 +- .../asset_processor_tests/asset_processor_batch_tests_2.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt index 5d4f96c92a..41eb13bf4c 100644 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt @@ -24,7 +24,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_pytest( NAME AssetPipelineTests.Batch_2_Main - TEST_SUITE sandbox + TEST_SUITE main PATH ${CMAKE_CURRENT_LIST_DIR}/asset_processor_batch_tests_2.py EXCLUDE_TEST_RUN_TARGET_FROM_IDE RUNTIME_DEPENDENCIES diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py index 00b04f1847..79ad23de92 100755 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py @@ -74,6 +74,7 @@ class TestsAssetProcessorBatch_AllPlatforms(object): @pytest.mark.assetpipeline @pytest.mark.test_case_id("C3594360") @pytest.mark.test_case_id("C3688013") + @pytest.mark.SUITE_sandbox # fmt:off def test_AllSupportedPlatforms_FastScanWorks_FasterThanFullScan(self, workspace, asset_processor): # fmt:on