Dynamic Vegetation automated test conversion/optimization (#4175)
* Initial batch of optimized Dynamic Vegetation tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Adding another round of optimized Dynamic Vegetation tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Adding more optimized Dynamic Vegetation tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Adding another round of optimized Dynamic Vegetation tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Final batch of converted Dynamic Vegetation tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Re-organizing/cleaning up TestSuite files Signed-off-by: jckand-amzn <jckand@amazon.com> * Running optimized tests without xfail marker for Jenkins test Signed-off-by: jckand-amzn <jckand@amazon.com> * Corrected path on CMakeLists.txt to point to the correct TestSuite file for optimized tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Adding xfail mark to DistanceBetweenFilter tests due to Editor deadlock Signed-off-by: jckand-amzn <jckand@amazon.com> * Updating CMakeLists to build Launcher Signed-off-by: jckand-amzn <jckand@amazon.com> * Updating xfail for DistanceBetweenFilter tests to skips as they timeout and cause cascading test failures Signed-off-by: jckand-amzn <jckand@amazon.com> * Re-added xfail marker to optimized tests Signed-off-by: jckand-amzn <jckand@amazon.com> * Correcting a few typos Signed-off-by: jckand-amzn <jckand@amazon.com>
This commit is contained in:
+4
-2
@@ -81,7 +81,8 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
|
||||
|
||||
|
||||
def launch_and_validate_results_launcher(launcher, level, remote_console_instance, expected_lines, null_renderer=True,
|
||||
port_listener_timeout=120, log_monitor_timeout=300, remote_console_port=4600):
|
||||
port_listener_timeout=120, log_monitor_timeout=300, remote_console_port=4600,
|
||||
launch_ap=True):
|
||||
"""
|
||||
Runs the launcher with the specified level, and monitors Game.log for expected lines.
|
||||
:param launcher: Configured launcher object to run test against.
|
||||
@@ -92,6 +93,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc
|
||||
:param port_listener_timeout: Timeout for verifying successful connection to Remote Console.
|
||||
:param log_monitor_timeout: Timeout for monitoring for lines in Game.log
|
||||
:param remote_console_port: The port used to communicate with the Remote Console.
|
||||
:param launch_ap: Whether or not to launch AP. Defaults to True.
|
||||
"""
|
||||
|
||||
def _check_for_listening_port(port):
|
||||
@@ -110,7 +112,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc
|
||||
launcher.args.extend(["-rhi=Null"])
|
||||
|
||||
# Start the Launcher
|
||||
with launcher.start():
|
||||
with launcher.start(launch_ap=launch_ap):
|
||||
|
||||
# Ensure Remote Console can be reached
|
||||
waiter.wait_for(
|
||||
|
||||
Reference in New Issue
Block a user