birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Updating imports for LandscapeCanvas tests to new utils location

Browse Source 
- Enabling Atom Null Renderer for launch_and_validate_results()
This commit is contained in:
jckand
2021-04-23 13:48:07 -05:00
parent b2f0df99a7
commit 4c8401ec7a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+2 -2
View File
@@ -32,7 +32,7 @@ def teardown_editor(editor):
def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[], def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[],
halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=False, cfg_args=[], halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=True, cfg_args=[],
timeout=300): timeout=300):
""" """
Runs the Editor with the specified script, and monitors for expected log lines. Runs the Editor with the specified script, and monitors for expected log lines.
@@ -58,7 +58,7 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
if auto_test_mode: if auto_test_mode:
editor.args.extend(["--autotest_mode"]) editor.args.extend(["--autotest_mode"])
if null_renderer: if null_renderer:
editor.args.extend(["-NullRenderer"]) editor.args.extend(["-rhi=Null"])
with editor.start(): with editor.start():
AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
+1 -1
View File
@@ -21,7 +21,7 @@ import azlmbr.math as math
import azlmbr.paths import azlmbr.paths
sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
from automatedtesting_shared.editor_test_helper import EditorTestHelper from editor_python_test_tools.editor_test_helper import EditorTestHelper
editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID
createdEntityId = None createdEntityId = None
AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py
+1 -1
View File
@@ -22,7 +22,7 @@ import pytest
# Bail on the test if ly_test_tools doesn't exist. # Bail on the test if ly_test_tools doesn't exist.
pytest.importorskip('ly_test_tools') pytest.importorskip('ly_test_tools')
import ly_test_tools.environment.file_system as file_system import ly_test_tools.environment.file_system as file_system
import automateeditor_python_test_toolsdtesting_shared.hydra_test_utils as hydra import editor_python_test_tools.hydra_test_utils as hydra
test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts')