Merge branch 'main' into script_canvas

2021-05-09 22:37:59 -07:00
parent 786cd9fcb7 8afb35cb10
commit 8f7d144b35
114 changed files with 4296 additions and 822 deletions
@@ -51,7 +51,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
        TEST_SUITE sandbox
        TEST_SERIAL
        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Sandbox.py
-        TIMEOUT 3600
+        TIMEOUT 1500
        RUNTIME_DEPENDENCIES
            Legacy::Editor
            AZ::AssetProcessor
@@ -42,6 +42,7 @@ class TestAssetPicker(object):

    @pytest.mark.test_case_id("C13751579", "C1508814")
    @pytest.mark.SUITE_periodic
+    @pytest.mark.xfail      # ATOM-15493
    def test_AssetPicker_UI_UX(self, request, editor, level, launcher_platform):
        expected_lines = [
            "TestEntity Entity successfully created",