From a918b3d31a16a80c2634686c5820482dc9eee5a9 Mon Sep 17 00:00:00 2001 From: moraaar Date: Wed, 21 Jul 2021 19:03:44 +0100 Subject: [PATCH 1/2] Moving test_C15425929_Undo_Redo flaky test to sandbox test suite Signed-off-by: moraaar --- AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py | 5 ----- .../Gem/PythonTests/physics/TestSuite_Sandbox.py | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py index 8e659b2ef6..bda4dae82b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py @@ -43,11 +43,6 @@ class TestAutomation(TestAutomationBase): from . import C4044459_Material_DynamicFriction as test_module self._run_test(request, workspace, editor, test_module) - @revert_physics_config - def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): - from . import C15425929_Undo_Redo as test_module - self._run_test(request, workspace, editor, test_module) - @revert_physics_config def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor, launcher_platform): diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py index fb798371a4..e2defae28d 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py @@ -43,3 +43,9 @@ class TestAutomation(TestAutomationBase): # Fixme: unexpected_lines.append(f"GroupName: {group}") # Fixme: expected_lines=["GroupName: "] self._run_test(request, workspace, editor, test_module) + + ## Seems to be flaky, need to investigate + @revert_physics_config + def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): + from . import C15425929_Undo_Redo as test_module + self._run_test(request, workspace, editor, test_module) From caa4e30b380806f351f3c1450bbe2f1b8ae347dc Mon Sep 17 00:00:00 2001 From: moraaar Date: Wed, 21 Jul 2021 19:12:31 +0100 Subject: [PATCH 2/2] Marking test_C15425929_Undo_Redo as xfail. Signed-off-by: moraaar --- AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py index e2defae28d..255016ddd6 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py @@ -45,6 +45,8 @@ class TestAutomation(TestAutomationBase): self._run_test(request, workspace, editor, test_module) ## Seems to be flaky, need to investigate + @pytest.mark.xfail( + reason="Editor crashes and errors about files accessed by multiple processes appear in the log.") @revert_physics_config def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): from . import C15425929_Undo_Redo as test_module