Merge pull request #7527 from aws-lumberyard-dev/physics_fix

Prevent unsafe calls to AssetProcessor
monroegm-disable-blank-issue-2
Sean Sweeney 4 years ago committed by GitHub
commit 2a977510de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -49,9 +49,11 @@ class TestAutomationBase:
time_info_str += f"{testcase_name}: (Full:{t} sec, Editor:{editor_t} sec)\n"
logger.info(time_info_str)
# Kill all ly processes
if cls.asset_processor is not None:
cls.asset_processor.teardown()
cls._kill_ly_processes()
# Kill all ly processes
cls._kill_ly_processes(include_asset_processor=True)
def _run_test(self, request, workspace, editor, testcase_module, extra_cmdline_args=[], batch_mode=True,
autotest_mode=True, use_null_renderer=True, enable_prefab_system=True):
@ -62,12 +64,14 @@ class TestAutomationBase:
#########
# Setup #
if self.asset_processor is None:
self._kill_ly_processes(include_asset_processor=True)
self.__class__.asset_processor = AssetProcessor(workspace)
self.asset_processor.backup_ap_settings()
else:
self._kill_ly_processes(include_asset_processor=False)
if not self.asset_processor.process_exists():
self.asset_processor.start()
self.asset_processor.wait_for_idle()

Loading…
Cancel
Save