Merge pull request #927 from aws-lumberyard-dev/jckand/FoundationAuto

Re-enabling Large Worlds tests in Main test suite

AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt

@@ -13,22 +13,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## DynVeg ##
 
-    # Temporarily moving all tests to periodic suite - SPEC-6553
-    #ly_add_pytest(
-    #    NAME AutomatedTesting::DynamicVegetationTests_Main
-    #    TEST_SERIAL
-    #    TEST_SUITE main
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
-    #    PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-    #    TIMEOUT 1500
-    #    RUNTIME_DEPENDENCIES
-    #        AZ::AssetProcessor
-    #        Legacy::Editor
-    #        AutomatedTesting.GameLauncher
-    #        AutomatedTesting.Assets
-    #    COMPONENT
-    #        LargeWorlds
-    #)
+    ly_add_pytest(
+        NAME AutomatedTesting::DynamicVegetationTests_Main
+        TEST_SERIAL
+        TEST_SUITE main
+        PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
+        PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+        COMPONENT
+            LargeWorlds
+    )
 
 
     ly_add_pytest(
@@ -137,21 +136,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
             LargeWorlds
     )
 ## LandscapeCanvas ##
-    # Temporarily moving all tests to periodic suite - SPEC-6553
-    #ly_add_pytest(
-    #    NAME AutomatedTesting::LandscapeCanvasTests_Main
-    #    TEST_SERIAL
-    #    TEST_SUITE main
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
-    #    PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-    #    TIMEOUT 1500
-    #    RUNTIME_DEPENDENCIES
-    #       AZ::AssetProcessor
-    #       Legacy::Editor
-    #       AutomatedTesting.Assets
-    #    COMPONENT
-    #        LargeWorlds
-    #)
+
+    ly_add_pytest(
+        NAME AutomatedTesting::LandscapeCanvasTests_Main
+        TEST_SERIAL
+        TEST_SUITE main
+        PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas
+        PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+           AZ::AssetProcessor
+           Legacy::Editor
+           AutomatedTesting.Assets
+        COMPONENT
+            LargeWorlds
+    )
 
     ly_add_pytest(
         NAME AutomatedTesting::LandscapeCanvasTests_Periodic

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py

@@ -41,7 +41,7 @@ class TestDynamicSliceInstanceSpawner(object):
         return console
 
     @pytest.mark.test_case_id("C28851763")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_main
     @pytest.mark.dynveg_area
     @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
     def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, editor, level, workspace, project,

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py

@@ -37,7 +37,7 @@ class TestEmptyInstanceSpawner(object):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
     @pytest.mark.test_case_id("C28851762")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_main
     @pytest.mark.dynveg_area
     def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, editor, level, launcher_platform):
         cfg_args = [level]

AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py

@@ -118,7 +118,7 @@ class TestGraphComponentSync(object):
 
     @pytest.mark.test_case_id('C15987206')
     @pytest.mark.SUITE_main
-    def test_LandscapeCanvas_GradientMixerNodeConstruction(self, request, editor, level, launcher_platform):
+    def test_LandscapeCanvas_GradientMixer_NodeConstruction(self, request, editor, level, launcher_platform):
         """
         Verifies a Gradient Mixer can be setup in Landscape Canvas and all references are property set.
         """
@@ -141,7 +141,7 @@ class TestGraphComponentSync(object):
 
     @pytest.mark.test_case_id('C21333743')
     @pytest.mark.SUITE_periodic
-    def test_LandscapeCanvas_LayerBlenderNodeConstruction(self, request, editor, level, launcher_platform):
+    def test_LandscapeCanvas_LayerBlender_NodeConstruction(self, request, editor, level, launcher_platform):
         """
         Verifies a Layer Blender can be setup in Landscape Canvas and all references are property set.
         """