Prevent unsafe calls to AssetProcessor
Signed-off-by: sweeneys <sweeneys@amazon.com>
This commit is contained in:
@@ -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)
|
||||
if cls.asset_processor is not None:
|
||||
cls.asset_processor.teardown()
|
||||
|
||||
# Kill all ly processes
|
||||
cls.asset_processor.teardown()
|
||||
cls._kill_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,14 +64,16 @@ 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()
|
||||
|
||||
self._kill_ly_processes(include_asset_processor=False)
|
||||
self.asset_processor.start()
|
||||
self.asset_processor.wait_for_idle()
|
||||
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()
|
||||
|
||||
def teardown():
|
||||
if os.path.exists(workspace.paths.editor_log()):
|
||||
|
||||
Reference in New Issue
Block a user