Converting Editor automated tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py

@@ -5,15 +5,22 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
+from typing import List
+from math import isclose
+import collections.abc
+
 import azlmbr.bus as bus
 import azlmbr.editor as editor
 import azlmbr.entity as entity
 import azlmbr.legacy.general as general
 import azlmbr.object
 
-from typing import List
-from math import isclose
-import collections.abc
+from editor_python_test_tools.utils import TestHelper as helper
+
+
+def open_base_level():
+    helper.init_idle()
+    helper.open_level("Prefab", "Base")
 
 
 def find_entity_by_name(entity_name):

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py

@@ -59,8 +59,8 @@ def AssetBrowser_SearchFiltering():
 
         import azlmbr.legacy.general as general
 
+        import editor_python_test_tools.hydra_editor_utils as hydra
         from editor_python_test_tools.utils import Report
-        from editor_python_test_tools.utils import TestHelper as helper
 
         def verify_files_appeared(model, allowed_asset_extensions, parent_index=QtCore.QModelIndex()):
             indexes = [parent_index]
@@ -80,8 +80,7 @@ def AssetBrowser_SearchFiltering():
             return True
 
         # 1) Open an existing simple level
-        helper.init_idle()
-        helper.open_level("Physics", "Base")
+        hydra.open_base_level()
 
         # 2) Open Asset Browser (if not opened already)
         editor_window = pyside_utils.get_editor_main_window()

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py

@@ -53,6 +53,7 @@ def AssetBrowser_TreeNavigation():
     import azlmbr.legacy.general as general
 
     import editor_python_test_tools.pyside_utils as pyside_utils
+    import editor_python_test_tools.hydra_editor_utils as hydra
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -69,8 +70,7 @@ def AssetBrowser_TreeNavigation():
     file_path = ("AutomatedTesting", "Assets", "ImageGradients", "image_grad_test_gsi.png")
 
     # 1) Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()
 
     # 2) Open Asset Browser (if not opened already)
     editor_window = pyside_utils.get_editor_main_window()

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py

@@ -215,8 +215,7 @@ def AssetPicker_UI_UX():
                     QtTest.QTest.keyClick(tree, Qt.Key_Enter, Qt.NoModifier)
 
         # 1) Open an existing simple level
-        helper.init_idle()
-        helper.open_level("Physics", "Base")
+        hydra.open_base_level()
 
         # 2) Create entity and add Mesh component
         entity_position = math.Vector3(125.0, 136.0, 32.0)

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py

@@ -56,19 +56,17 @@ def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
             06. delete parent entity
     """
 
+    import editor_python_test_tools.hydra_editor_utils as hydra
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.editor_entity_utils import EditorEntity
 
     import azlmbr.bus as bus
     import azlmbr.editor as editor
     import azlmbr.entity as entity
-    import azlmbr.legacy.general as general
     import azlmbr.object
 
     # 01. load an existing level
-    test_level = 'Simple'
-    general.open_level_no_prompt(test_level)
-    Report.result(Tests.load_level, general.get_current_level_name() == test_level)
+    hydra.open_base_level()
 
     # 02. create parent entity and set name
     # Delete any exiting entity and Create a new Entity at the root level

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py

@@ -31,7 +31,7 @@ class Tests:
         "Component removed from entity successfully",
         "Failed to remove component from entity"
     )
-    level_saved_and_exported = (
+    saved_and_exported = (
         "Level saved and exported successfully",
         "Failed to save/export level"
     )
@@ -52,8 +52,7 @@ def BasicEditorWorkflows_LevelEntityComponentCRUD():
         - A new entity can be created
         - Entity hierarchy can be adjusted
         - Components can be added/removed/updated
-        - Level can be saved
-        - Level can be exported
+        - Level can be saved/exported
 
         Note:
         - This test file must be called from the O3DE Editor command terminal
@@ -70,7 +69,7 @@ def BasicEditorWorkflows_LevelEntityComponentCRUD():
         import azlmbr.editor as editor
         import azlmbr.entity as entity
         import azlmbr.math as math
-        import azlmbr.paths
+        import azlmbr.paths as paths
 
         import editor_python_test_tools.hydra_editor_utils as hydra
         from editor_python_test_tools.utils import Report
@@ -84,7 +83,7 @@ def BasicEditorWorkflows_LevelEntityComponentCRUD():
             return None
 
         # 1) Create a new level
-        level = "tmp_level"
+        lvl_name = "tmp_level"
         editor_window = pyside_utils.get_editor_main_window()
         new_level_action = pyside_utils.get_action_for_menu_path(editor_window, "File", "New Level")
         pyside_utils.trigger_action_async(new_level_action)
@@ -95,23 +94,24 @@ def BasicEditorWorkflows_LevelEntityComponentCRUD():
                 Report.info("New Level dialog opened")
             grp_box = new_level_dlg.findChild(QtWidgets.QGroupBox, "STATIC_GROUP1")
             level_name = grp_box.findChild(QtWidgets.QLineEdit, "LEVEL")
-            level_name.setText(level)
+            level_name.setText(lvl_name)
             button_box = new_level_dlg.findChild(QtWidgets.QDialogButtonBox, "buttonBox")
             button_box.button(QtWidgets.QDialogButtonBox.Ok).click()
 
         # Verify new level was created successfully
         level_create_success = await pyside_utils.wait_for_condition(lambda: editor.EditorToolsApplicationRequestBus(
-            bus.Broadcast, "GetCurrentLevelName") == level, 5.0)
+            bus.Broadcast, "GetCurrentLevelName") == lvl_name, 5.0)
         Report.critical_result(Tests.level_created, level_create_success)
 
         # 2) Delete existing entities, and create and manipulate new entities via Entity Inspector
         search_filter = azlmbr.entity.SearchFilter()
         all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
         editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
-        entity_outliner_widget = editor_window.findChild(QtWidgets.QWidget, "OutlinerWidgetUI")
+        entity_outliner_widget = editor_window.findChild(QtWidgets.QWidget, "EntityOutlinerWidgetUI")
         outliner_object_list = entity_outliner_widget.findChild(QtWidgets.QWidget, "m_objectList_Contents")
         outliner_tree = outliner_object_list.findChild(QtWidgets.QWidget, "m_objectTree")
-        await pyside_utils.trigger_context_menu_entry(outliner_tree, "Create entity")
+        outliner_viewport = outliner_tree.findChild(QtWidgets.QWidget, "qt_scrollarea_viewport")
+        await pyside_utils.trigger_context_menu_entry(outliner_viewport, "Create entity")
 
         # Find the new entity
         parent_entity_id = find_entity_by_name("Entity1")
@@ -153,14 +153,10 @@ def BasicEditorWorkflows_LevelEntityComponentCRUD():
         save_level_action = pyside_utils.get_action_for_menu_path(editor_window, "File", "Save")
         pyside_utils.trigger_action_async(save_level_action)
 
-        # 5) Export the level
-        export_action = pyside_utils.get_action_for_menu_path(editor_window, "Game", "Export to Engine")
-        pyside_utils.trigger_action_async(export_action)
-        level_pak_file = os.path.join(
-            "AutomatedTesting", "Levels", level, "level.pak"
-        )
-        export_success = await pyside_utils.wait_for_condition(lambda: os.path.exists(level_pak_file), 5.0)
-        Report.result(Tests.level_saved_and_exported, export_success)
+        # 5) Verify the save/export of the level
+        level_prefab_path = os.path.join(paths.products, "levels", lvl_name, f"{lvl_name}.spawnable")
+        success = await pyside_utils.wait_for_condition(lambda: os.path.exists(level_prefab_path), 5.0)
+        Report.result(Tests.saved_and_exported, success)
 
     run_test()
 

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py

@@ -63,7 +63,7 @@ def ComponentCRUD_Add_Delete_Components():
         :return: None
         """
 
-        from PySide2 import QtWidgets, QtTest, QtCore
+        from PySide2 import QtWidgets, QtTest
         from PySide2.QtCore import Qt
 
         import azlmbr.legacy.general as general
@@ -74,7 +74,6 @@ def ComponentCRUD_Add_Delete_Components():
 
         import editor_python_test_tools.hydra_editor_utils as hydra
         from editor_python_test_tools.utils import Report
-        from editor_python_test_tools.utils import TestHelper as helper
 
         async def add_component(component_name):
             pyside_utils.click_button_async(add_comp_btn)
@@ -88,8 +87,7 @@ def ComponentCRUD_Add_Delete_Components():
             QtTest.QTest.keyClick(tree, Qt.Key_Enter, Qt.NoModifier)
 
         # 1) Open an existing simple level
-        helper.init_idle()
-        helper.open_level("Physics", "Base")
+        hydra.open_base_level()
 
         # 2) Create entity
         entity_position = math.Vector3(125.0, 136.0, 32.0)

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py

@@ -62,12 +62,11 @@ def Docking_BasicDockedTools():
         import azlmbr.editor as editor
         import azlmbr.entity as entity
 
+        import editor_python_test_tools.hydra_editor_utils as hydra
         from editor_python_test_tools.utils import Report
-        from editor_python_test_tools.utils import TestHelper as helper
 
         # Open an existing simple level
-        helper.init_idle()
-        helper.open_level("Physics", "Base")
+        hydra.open_base_level()
 
         # Make sure the Entity Outliner, Entity Inspector and Console tools are open
         general.open_pane("Entity Outliner (PREVIEW)")
@@ -80,7 +79,7 @@ def Docking_BasicDockedTools():
         editor.EditorEntityAPIBus(bus.Event, 'SetName', entity_id, entity_original_name)
 
         editor_window = pyside_utils.get_editor_main_window()
-        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner (PREVIEW)")
+        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner")
 
         # 1) Open the tools and dock them together in a floating tabbed widget.
         # We drag/drop it over the viewport since it doesn't allow docking, so this will undock it
@@ -89,7 +88,7 @@ def Docking_BasicDockedTools():
 
         # We need to grab a new reference to the Entity Outliner QDockWidget because when it gets moved
         # to the floating window, its parent changes so the wrapped intance we had becomes invalid
-        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner (PREVIEW)")
+        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner")
 
         # Dock the Entity Inspector tabbed with the floating Entity Outliner
         entity_inspector = editor_window.findChild(QtWidgets.QDockWidget, "Entity Inspector")
@@ -106,7 +105,7 @@ def Docking_BasicDockedTools():
         # Check to ensure all the tools are parented to the same QStackedWidget
         def check_all_panes_tabbed():
             entity_inspector = editor_window.findChild(QtWidgets.QDockWidget, "Entity Inspector")
-            entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner (PREVIEW)")
+            entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner")
             console = editor_window.findChild(QtWidgets.QDockWidget, "Console")
             entity_inspector_parent = entity_inspector.parentWidget()
             entity_outliner_parent = entity_outliner.parentWidget()
@@ -122,7 +121,7 @@ def Docking_BasicDockedTools():
 
         # 2.1,2) Select an Entity in the Entity Outliner.
         entity_inspector = editor_window.findChild(QtWidgets.QDockWidget, "Entity Inspector")
-        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner (PREVIEW)")
+        entity_outliner = editor_window.findChild(QtWidgets.QDockWidget, "Entity Outliner")
         console = editor_window.findChild(QtWidgets.QDockWidget, "Console")
         object_tree = entity_outliner.findChild(QtWidgets.QTreeView, "m_objectTree")
         test_entity_index = pyside_utils.find_child_by_pattern(object_tree, entity_original_name)

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py

@@ -30,11 +30,13 @@ def EntityOutliner_EntityOrdering():
     5) Add another new entity, ensure the rest of the order is unchanged
     """
 
-    import editor_python_test_tools.pyside_utils as pyside_utils
+    from PySide2 import QtCore
+
     import azlmbr.legacy.general as general
+
+    import editor_python_test_tools.hydra_editor_utils as hydra
+    import editor_python_test_tools.pyside_utils as pyside_utils
     from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
-    from PySide2 import QtCore, QtWidgets, QtGui, QtTest
 
     # Grab the Editor, Entity Outliner, and Outliner Model
     editor_window = pyside_utils.get_editor_main_window()
@@ -110,8 +112,7 @@ def EntityOutliner_EntityOrdering():
     expected_order = []
 
     # 1) Open the empty Prefab Base level
-    helper.init_idle()
-    helper.open_level("Prefab", "Base")
+    hydra.open_base_level()
 
     # 2) Add 5 entities to the outliner
     ENTITIES_TO_ADD = 5

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py

@@ -69,8 +69,8 @@ def InputBindings_Add_Remove_Input_Events():
 
         import azlmbr.legacy.general as general
 
+        import editor_python_test_tools.hydra_editor_utils as hydra
         from editor_python_test_tools.utils import Report
-        from editor_python_test_tools.utils import TestHelper as helper
 
         def open_asset_editor():
             general.open_pane("Asset Editor")
@@ -81,8 +81,7 @@ def InputBindings_Add_Remove_Input_Events():
             return not general.is_pane_visible("Asset Editor")
 
         # 1) Open an existing simple level
-        helper.init_idle()
-        helper.open_level("Physics", "Base")
+        hydra.open_base_level()
 
         # 2) Open Asset Editor
         Report.result(Tests.asset_editor_opened, open_asset_editor())

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py

@@ -26,9 +26,9 @@ def Menus_EditMenuOptions_Work():
     :return: None
     """
 
+    import editor_python_test_tools.hydra_editor_utils as hydra
     import editor_python_test_tools.pyside_utils as pyside_utils
     from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
 
     edit_menu_options = [
         ("Undo",),
@@ -57,8 +57,7 @@ def Menus_EditMenuOptions_Work():
     ]
 
     # 1) Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()
 
     # 2) Interact with Edit Menu options
     editor_window = pyside_utils.get_editor_main_window()

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py

@@ -26,29 +26,27 @@ def Menus_FileMenuOptions_Work():
     :return: None
     """
 
+    import editor_python_test_tools.hydra_editor_utils as hydra
     import editor_python_test_tools.pyside_utils as pyside_utils
     from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
 
     file_menu_options = [
         ("New Level",),
-        ("Open Level",),
+        #("Open Level",),               Temporarily disabled due to https://github.com/o3de/o3de/issues/6605
         ("Import",),
         ("Save",),
-        ("Save As",),
+        #("Save As",),                  Temporarily disabled due to https://github.com/o3de/o3de/issues/6605
         ("Save Level Statistics",),
         ("Edit Project Settings",),
-        ("Edit Platform Settings",),
+        #("Edit Platform Settings",),   Temporarily disabled due to https://github.com/o3de/o3de/issues/6604
         ("New Project",),
         ("Open Project",),
         ("Show Log File",),
-        ("Resave All Slices",),
         ("Exit",),
     ]
 
     # 1) Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()
 
     # 2) Interact with File Menu options
     editor_window = pyside_utils.get_editor_main_window()

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py

@@ -26,9 +26,9 @@ def Menus_ViewMenuOptions_Work():
     :return: None
     """
 
+    import editor_python_test_tools.hydra_editor_utils as hydra
     import editor_python_test_tools.pyside_utils as pyside_utils
     from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
 
     view_menu_options = [
         ("Center on Selection",),
@@ -45,8 +45,7 @@ def Menus_ViewMenuOptions_Work():
     ]
 
     # 1) Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()
 
     # 2) Interact with View Menu options
     editor_window = pyside_utils.get_editor_main_window()

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py

@@ -33,22 +33,20 @@ class TestAutomation(TestAutomationBase):
     def test_BasicEditorWorkflows_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform,
                                                            remove_test_level):
         from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False)
 
     @pytest.mark.REQUIRES_gpu
     def test_BasicEditorWorkflows_GPU_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform,
                                                                remove_test_level):
         from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module
         self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False,
-                       use_null_renderer=False, enable_prefab_system=False)
+                       use_null_renderer=False)
 
-    def test_EntityOutlienr_EntityOrdering(self, request, workspace, editor, launcher_platform):
+    def test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(self, request, workspace, editor,
+                                                                    launcher_platform):
+        from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False)
+
+    def test_EntityOutliner_EntityOrdering(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import EntityOutliner_EntityOrdering as test_module
-        self._run_test(
-            request, 
-            workspace, 
-            editor, 
-            test_module, 
-            batch_mode=False, 
-            autotest_mode=True,
-        )
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py

@@ -12,7 +12,6 @@ import ly_test_tools.environment.file_system as file_system
 from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
 
 
-@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.")
 @pytest.mark.SUITE_main
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
@@ -21,8 +20,12 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
     # Disable -autotest_mode and -BatchMode. Tests cannot run in -BatchMode due to UI interactions, and these tests
     # interact with modal dialogs
     global_extra_cmdline_args = []
-    
-    enable_prefab_system = False
+
+    class test_AssetPicker_UI_UX(EditorSharedTest):
+        from .EditorScripts import AssetPicker_UI_UX as test_module
+
+    class test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(EditorSingleTest):
+        from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module
 
     class test_BasicEditorWorkflows_LevelEntityComponentCRUD(EditorSingleTest):
         # Custom teardown to remove slice asset created during test
@@ -45,9 +48,6 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
     class test_InputBindings_Add_Remove_Input_Events(EditorSharedTest):
         from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module
 
-    class test_AssetPicker_UI_UX(EditorSharedTest):
-        from .EditorScripts import AssetPicker_UI_UX as test_module
-
 
 @pytest.mark.SUITE_main
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@@ -57,23 +57,26 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions
     global_extra_cmdline_args = ["-autotest_mode"]
 
-    enable_prefab_system = False
+    class test_AssetBrowser_SearchFiltering(EditorSharedTest):
+        from .EditorScripts import AssetBrowser_SearchFiltering as test_module
 
     class test_AssetBrowser_TreeNavigation(EditorSharedTest):
         from .EditorScripts import AssetBrowser_TreeNavigation as test_module
 
-    class test_AssetBrowser_SearchFiltering(EditorSharedTest):
-        from .EditorScripts import AssetBrowser_SearchFiltering as test_module
-
     class test_ComponentCRUD_Add_Delete_Components(EditorSharedTest):
         from .EditorScripts import ComponentCRUD_Add_Delete_Components as test_module
 
-    class test_Menus_ViewMenuOptions_Work(EditorSharedTest):
-        from .EditorScripts import Menus_ViewMenuOptions as test_module
+    class test_Docking_BasicDockedTools(EditorSharedTest):
+        from .EditorScripts import Docking_BasicDockedTools as test_module
+
+    class test_EntityOutliner_EntityOrdering(EditorSharedTest):
+        from .EditorScripts import EntityOutliner_EntityOrdering as test_module
+
+    class test_Menus_EditMenuOptions_Work(EditorSharedTest):
+        from .EditorScripts import Menus_EditMenuOptions as test_module
 
-    @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208")
     class test_Menus_FileMenuOptions_Work(EditorSharedTest):
         from .EditorScripts import Menus_FileMenuOptions as test_module
 
-    class test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(EditorSharedTest):
-        from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module
+    class test_Menus_ViewMenuOptions_Work(EditorSharedTest):
+        from .EditorScripts import Menus_ViewMenuOptions as test_module

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py

@@ -10,6 +10,7 @@ import pytest
 import sys
 
 import ly_test_tools.environment.file_system as file_system
+import ly_test_tools.environment.process_utils as process_utils
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
 from base import TestAutomationBase
@@ -25,36 +26,42 @@ def remove_test_level(request, workspace, project):
     request.addfinalizer(teardown)
 
 
+@pytest.fixture
+def kill_external_tools(request):
+    def teardown():
+        process_utils.kill_processes_named("o3de.exe")
+    request.addfinalizer(teardown)
+
+
 @pytest.mark.SUITE_periodic
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(TestAutomationBase):
 
-    def test_AssetBrowser_TreeNavigation(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import AssetBrowser_TreeNavigation as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
-
     def test_AssetBrowser_SearchFiltering(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetBrowser_SearchFiltering as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+
+    def test_AssetBrowser_TreeNavigation(self, request, workspace, editor, launcher_platform):
+        from .EditorScripts import AssetBrowser_TreeNavigation as test_module
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)
 
     def test_AssetPicker_UI_UX(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetPicker_UI_UX as test_module
-        self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False)
 
     def test_ComponentCRUD_Add_Delete_Components(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ComponentCRUD_Add_Delete_Components as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)
 
     def test_InputBindings_Add_Remove_Input_Events(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False)
+
+    def test_Menus_FileMenuOptions_Work(self, request, workspace, editor, launcher_platform, kill_external_tools):
+        from .EditorScripts import Menus_FileMenuOptions as test_module
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)
 
     def test_Menus_ViewMenuOptions_Work(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Menus_ViewMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
-
-    @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208")
-    def test_Menus_FileMenuOptions_Work(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import Menus_FileMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py

@@ -20,8 +20,8 @@ class TestAutomation(TestAutomationBase):
 
     def test_Menus_EditMenuOptions_Work(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Menus_EditMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)
 
     def test_Docking_BasicDockedTools(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Docking_BasicDockedTools as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False)

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py

@@ -19,8 +19,6 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions
     global_extra_cmdline_args = ["-autotest_mode"]
 
-    enable_prefab_system = False
-
     class test_Docking_BasicDockedTools(EditorSharedTest):
         from .EditorScripts import Docking_BasicDockedTools as test_module