Resolved conflicts in merge from stabilization/2106 -> development.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-11 15:33:50 -05:00
parent 2564e8f8dc 4b817a6483
commit 5b0046ce78
5 changed files with 148 additions and 7 deletions
@@ -105,7 +105,7 @@ class TestGeneralGraphFunctionality(object):

    @pytest.mark.test_case_id("C17488412")
    @pytest.mark.SUITE_periodic
-    @pytest.mark.xfail      # https://github.com/o3de/o3de/issues/2201
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
    def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, editor, level, launcher_platform):
        cfg_args = [level]