Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -27,6 +27,7 @@ mock_engine_root = "mock_engine_root"
|
||||
mock_dev_path = "mock_dev_path"
|
||||
mock_build_directory = 'mock_build_directory'
|
||||
mock_project = 'mock_project'
|
||||
mock_project_path = os.path.join('some', 'dir', mock_project)
|
||||
|
||||
|
||||
@mock.patch('ly_test_tools._internal.managers.abstract_resource_locator.os.path.abspath',
|
||||
@@ -52,7 +53,8 @@ class TestAssetProcessor(object):
|
||||
mock_ap_path = 'mock_ap_path'
|
||||
mock_workspace.asset_processor_platform = 'foo'
|
||||
mock_workspace.paths.asset_processor.return_value = mock_ap_path
|
||||
mock_workspace.project = 'AutomatedTesting'
|
||||
mock_workspace.project = mock_project
|
||||
mock_workspace.paths.project.return_value = mock_project_path
|
||||
under_test = ly_test_tools.lumberyard.asset_processor.AssetProcessor(mock_workspace)
|
||||
under_test.enable_asset_processor_platform = mock.MagicMock()
|
||||
under_test.wait_for_idle = mock.MagicMock()
|
||||
@@ -60,7 +62,8 @@ class TestAssetProcessor(object):
|
||||
under_test.start(connect_to_ap=True)
|
||||
|
||||
assert under_test._ap_proc is not None
|
||||
mock_popen.assert_called_once_with([mock_ap_path, '--zeroAnalysisMode', '--regset="/Amazon/AzCore/Bootstrap/project_path=AutomatedTesting"',
|
||||
mock_popen.assert_called_once_with([mock_ap_path, '--zeroAnalysisMode',
|
||||
f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
|
||||
'--logDir', under_test.log_root(),
|
||||
'--acceptInput', '--platforms', 'bar'], cwd=os.path.dirname(mock_ap_path))
|
||||
mock_connect.assert_called()
|
||||
@@ -107,20 +110,24 @@ class TestAssetProcessor(object):
|
||||
@mock.patch('subprocess.run')
|
||||
def test_BatchProcess_NoFastscanBatchCompletes_Success(self, mock_run, mock_workspace):
|
||||
mock_workspace.project = None
|
||||
mock_workspace.paths.project.return_value = mock_project_path
|
||||
under_test = ly_test_tools.lumberyard.asset_processor.AssetProcessor(mock_workspace)
|
||||
apb_path = mock_workspace.paths.asset_processor_batch()
|
||||
mock_run.return_value.returncode = 0
|
||||
result, _ = under_test.batch_process(1, False)
|
||||
|
||||
assert result
|
||||
mock_run.assert_called_once_with([apb_path, '--logDir', under_test.log_root()],
|
||||
mock_run.assert_called_once_with([apb_path,
|
||||
f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
|
||||
'--logDir', under_test.log_root()],
|
||||
close_fds=True, capture_output=False,
|
||||
timeout=1)
|
||||
|
||||
@mock.patch('ly_test_tools._internal.managers.workspace.AbstractWorkspaceManager')
|
||||
@mock.patch('subprocess.run')
|
||||
def test_BatchProcess_FastscanBatchCompletes_Success(self, mock_run, mock_workspace):
|
||||
mock_workspace.project = 'AutomatedTesting'
|
||||
mock_workspace.project = mock_project
|
||||
mock_workspace.paths.project.return_value = mock_project_path
|
||||
under_test = ly_test_tools.lumberyard.asset_processor.AssetProcessor(mock_workspace)
|
||||
apb_path = mock_workspace.paths.asset_processor_batch()
|
||||
mock_run.return_value.returncode = 0
|
||||
@@ -128,18 +135,18 @@ class TestAssetProcessor(object):
|
||||
result = under_test.batch_process(1, True)
|
||||
|
||||
assert result
|
||||
mock_run.assert_called_once_with(
|
||||
[apb_path, '--zeroAnalysisMode', '--regset="/Amazon/AzCore/Bootstrap/project_path=AutomatedTesting"',
|
||||
'--logDir',
|
||||
under_test.log_root()],
|
||||
mock_run.assert_called_once_with([apb_path, '--zeroAnalysisMode',
|
||||
f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
|
||||
'--logDir', under_test.log_root()],
|
||||
close_fds=True, capture_output=False,
|
||||
timeout=1)
|
||||
|
||||
close_fds=True, capture_output=False,
|
||||
timeout=1)
|
||||
|
||||
@mock.patch('ly_test_tools._internal.managers.workspace.AbstractWorkspaceManager')
|
||||
@mock.patch('subprocess.run')
|
||||
def test_BatchProcess_ReturnCodeFail_Failure(self, mock_run, mock_workspace):
|
||||
mock_workspace.project = None
|
||||
mock_workspace.paths.project.return_value = mock_project_path
|
||||
under_test = ly_test_tools.lumberyard.asset_processor.AssetProcessor(mock_workspace)
|
||||
apb_path = mock_workspace.paths.asset_processor_batch()
|
||||
mock_run.return_value.returncode = 1
|
||||
@@ -147,9 +154,12 @@ class TestAssetProcessor(object):
|
||||
result, _ = under_test.batch_process(None, False)
|
||||
|
||||
assert not result
|
||||
mock_run.assert_called_once_with([apb_path, '--logDir', under_test.log_root()],
|
||||
mock_run.assert_called_once_with([apb_path,
|
||||
f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
|
||||
'--logDir', under_test.log_root()],
|
||||
close_fds=True, capture_output=False, timeout=28800.0)
|
||||
|
||||
|
||||
@mock.patch('ly_test_tools._internal.managers.workspace.AbstractWorkspaceManager')
|
||||
def test_EnableAssetProcessorPlatform_AssetProcessorObject_Updated(self, mock_workspace):
|
||||
under_test = ly_test_tools.lumberyard.asset_processor.AssetProcessor(mock_workspace)
|
||||
|
||||
Reference in New Issue
Block a user