Browse Source

Promoting DuplicatePrefab test to Main suite (#10528)

Signed-off-by: jckand-amzn <[email protected]>
jckand-amzn 3 years ago
parent
commit
e4ee2bf49e

+ 10 - 10
AutomatedTesting/Gem/PythonTests/Prefab/CMakeLists.txt

@@ -19,14 +19,14 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AutomatedTesting.Assets
             AutomatedTesting.Assets
     )
     )
 
 
-    ly_add_pytest(
-        NAME AutomatedTesting::PrefabTests_Periodic
-        TEST_SUITE periodic
-        TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
-        RUNTIME_DEPENDENCIES
-            Legacy::Editor
-            AZ::AssetProcessor
-            AutomatedTesting.Assets
-    )
+    #ly_add_pytest(
+    #    NAME AutomatedTesting::PrefabTests_Periodic
+    #    TEST_SUITE periodic
+    #    TEST_SERIAL
+    #    PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
+    #    RUNTIME_DEPENDENCIES
+    #        Legacy::Editor
+    #        AZ::AssetProcessor
+    #        AutomatedTesting.Assets
+    #)
 endif()
 endif()

+ 3 - 0
AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py

@@ -66,6 +66,9 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
     class test_DuplicatePrefab_ContainingASingleEntity(EditorSharedTest):
     class test_DuplicatePrefab_ContainingASingleEntity(EditorSharedTest):
         from .tests.duplicate_prefab import DuplicatePrefab_ContainingASingleEntity as test_module
         from .tests.duplicate_prefab import DuplicatePrefab_ContainingASingleEntity as test_module
 
 
+    class test_DuplicatePrefab_ContainingNestedEntitiesAndNestedPrefabs(EditorSharedTest):
+        from .tests.duplicate_prefab import DuplicatePrefab_ContainingNestedEntitiesAndNestedPrefabs as test_module
+
     class test_PrefabNotifications_PropagationNotificationsReceived(EditorSharedTest):
     class test_PrefabNotifications_PropagationNotificationsReceived(EditorSharedTest):
         from .tests.prefab_notifications import PrefabNotifications_PropagationNotificationsReceived as test_module
         from .tests.prefab_notifications import PrefabNotifications_PropagationNotificationsReceived as test_module
 
 

+ 0 - 3
AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Periodic.py

@@ -17,6 +17,3 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
 
 
     # Enable only -BatchMode for these tests. Some tests cannot run in -autotest_mode due to UI interactions
     # Enable only -BatchMode for these tests. Some tests cannot run in -autotest_mode due to UI interactions
     global_extra_cmdline_args = ["-BatchMode"]
     global_extra_cmdline_args = ["-BatchMode"]
-
-    class test_DuplicatePrefab_ContainingNestedEntitiesAndNestedPrefabs(EditorSharedTest):
-        from .tests.duplicate_prefab import DuplicatePrefab_ContainingNestedEntitiesAndNestedPrefabs as test_module