Integrating github/staging through commit ab87ed9

AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py

@@ -9,27 +9,38 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-#
-# This is a pytest module to test the in-Editor Python API from PythonEditorFuncs
-#
-import pytest
-pytest.importorskip('ly_test_tools')
-
-import sys
 import os
-sys.path.append(os.path.dirname(__file__))
-from hydra_utils import launch_test_case
+import pytest
+import logging
+
+# Bail on the test if ly_test_tools doesn't exist.
+pytest.importorskip("ly_test_tools")
+import ly_test_tools.environment.file_system as file_system
+import automatedtesting_shared.hydra_test_utils as hydra
+
+logger = logging.getLogger(__name__)
+test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts")
 
 
 @pytest.mark.SUITE_sandbox
-@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['Simple'])
-class TestComponentAssetAutomation(object):
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("level", ["tmp_level"])
+@pytest.mark.usefixtures("automatic_process_killer")
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+class TestComponentAssetListAutomation(object):
+    @pytest.fixture(autouse=True)
+    def setup_teardown(self, request, workspace, project, level):
+        # Cleanup our temp level
+        file_system.delete([os.path.join(workspace.paths.dev(), project, "Levels", level)], True, True)
 
-    def test_ComponentAsset(self, request, editor, level, launcher_platform):
+        def teardown():
+            # Cleanup our temp level
+            file_system.delete([os.path.join(workspace.paths.dev(), project, "Levels", level)], True, True)
+
+        request.addfinalizer(teardown)
+
+    def test_ComponentAssetList(self, request, editor, level, launcher_platform):
 
-        unexpected_lines=[]
         expected_lines = [
             'Set EditorDescriptorListComponent Embedded Assets as List',
             'Set EditorDescriptorListComponent Embedded Assets 0 Descriptor Mesh Asset ID',
@@ -37,7 +48,12 @@ class TestComponentAssetAutomation(object):
             'Set EditorDescriptorListComponent Embedded Assets 2 Descriptor Mesh Asset ID',
             'Set EditorDescriptorListComponent Embedded Assets 3 Descriptor Mesh Asset ID'
             ]
-        
-        test_case_file = os.path.join(os.path.dirname(__file__), 'ComponentUpdateListProperty_test_case.py')
-        launch_test_case(editor, test_case_file, expected_lines, unexpected_lines)
 
+        hydra.launch_and_validate_results(
+            request,
+            test_directory,
+            editor,
+            "ComponentUpdateListProperty_test_case.py",
+            expected_lines=expected_lines,
+            cfg_args=[level]
+        )