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

Merge branch 'main' into Atom/jromnoa/SPEC-6728-fix-material-editor-launcher

Browse Source
This commit is contained in:
jromnoa
2021-05-10 16:30:47 -07:00
parent 757a26825a e237d88dbe
commit a1b4844f6a
233 changed files with 73 additions and 38879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/test_tools_fixtures.py
+2 -2
View File
@@ -29,7 +29,7 @@ import ly_test_tools.environment.file_system
import ly_test_tools.launchers.launcher_helper
import ly_test_tools.launchers.platforms.base
import ly_test_tools.environment.watchdog
from ly_test_tools import ALL_PLATFORM_OPTIONS, HOST_OS_PLATFORM, HOST_OS_GENERIC_EXECUTABLE
from ly_test_tools import ALL_PLATFORM_OPTIONS, HOST_OS_PLATFORM, HOST_OS_DEDICATED_SERVER, HOST_OS_GENERIC_EXECUTABLE
logger = logging.getLogger(__name__)
@@ -260,7 +260,7 @@ def dedicated_launcher(request, workspace, crash_log_watchdog):
return _dedicated_launcher(
request=request,
workspace=workspace,
launcher_platform=get_fixture_argument(request, 'launcher_platform', HOST_OS_PLATFORM),
launcher_platform=get_fixture_argument(request, 'launcher_platform', HOST_OS_DEDICATED_SERVER),
level=get_fixture_argument(request, 'level', ''))