openstack/solum
Code Issues Proposed changes

Fix pipeline _get_context_from_last_execution()

Browse Source 
- change download_definition to get_definition
 - both the workbook and execution context return strings
   not dicts.

Change-Id: Ifb3069b0bf09618ba0e5941a725bf35ddb853e2c
This commit is contained in:
Angus Salkeld
2014-07-30 12:46:59 +10:00
committed by Pierre Padrixe
parent 9357c80714
commit 3fa06db475
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
solum/tests/api/handlers/test_pipeline.py
View File

@@ -119,12 +119,13 @@ class TestPipelineHandler(base.BaseTestCase):
def test_delete(self, mock_clients, mock_registry):
db_obj = fakes.FakePipeline()
mock_exec = mock.MagicMock()
mock_exec.context = {'stack_id': 'foo'}
mock_exec.context = json.dumps({'stack_id': 'foo'})
mock_mistral = mock_clients.return_value.mistral.return_value
mock_mistral.executions.get.return_value = mock_exec
wb = {'Workflow': {'tasks': {'start':
{'parameters': {'stack_id': ''}}}}}
mock_mistral.workbooks.download_definition.return_value = wb
wb = yamlutils.dump({'Workflow': {
'tasks': {'start':
{'parameters': {'stack_id': ''}}}}})
mock_mistral.workbooks.get_definition.return_value = wb
mock_registry.Pipeline.get_by_uuid.return_value = db_obj
handler = pipeline_handler.PipelineHandler(self.ctx)
@@ -159,14 +160,14 @@ class TestPipelineHandler(base.BaseTestCase):
mock_registry):
fpipe = fakes.FakePipeline()
mock_exec = mock.MagicMock()
mock_exec.context = {'stack_id': 'foo',
'build_service_url': 'url-for',
'base_image_id': '1-2-3-4',
'source_format': 'heroku'}
mock_exec.context = json.dumps({'stack_id': 'foo',
'build_service_url': 'url-for',
'base_image_id': '1-2-3-4',
'source_format': 'heroku'})
mock_mistral = mock_clients.return_value.mistral.return_value
mock_mistral.executions.get.return_value = mock_exec
wbook = yamlutils.load(catalog.get('workbooks', 'build_deploy'))
mock_mistral.workbooks.download_definition.return_value = wbook
wbook = catalog.get('workbooks', 'build_deploy')
mock_mistral.workbooks.get_definition.return_value = wbook
handler = pipeline_handler.PipelineHandler(self.ctx)
@@ -223,16 +224,17 @@ class TestPipelineHandler(base.BaseTestCase):
'language_pack': '1-2-3-4'}]}
mock_exec = mock.MagicMock()
mock_exec.context = {'stack_id': 'foo',
'build_service_url': 'url-for',
'base_image_id': '1-2-3-4',
'source_format': 'heroku',
'parameters': {'app_name': 'fruit',
'public_net': 'nsa-2-0'}}
mock_exec.context = json.dumps(
{'stack_id': 'foo',
'build_service_url': 'url-for',
'base_image_id': '1-2-3-4',
'source_format': 'heroku',
'parameters': {'app_name': 'fruit',
'public_net': 'nsa-2-0'}})
mock_mistral = mock_clients.return_value.mistral.return_value
mock_mistral.executions.get.return_value = mock_exec
wbook = yamlutils.load(catalog.get('workbooks', 'build_deploy'))
mock_mistral.workbooks.download_definition.return_value = wbook
wbook = catalog.get('workbooks', 'build_deploy')
mock_mistral.workbooks.get_definition.return_value = wbook
handler = pipeline_handler.PipelineHandler(self.ctx)