openstack/python-mistralclient
Code Issues Proposed changes

Fix CLI v2 tests for workflows

Browse Source 
Change-Id: I35307fb535efa4bda821730e947fd16a30b0a076
This commit is contained in:
Anastasia Kuznetsova
2014-09-24 10:31:14 +04:00
parent 8c59b64136
commit 6d1d882134
2 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
functionaltests/resources/v2/wf_v2.yaml
View File

@@ -1,9 +1,11 @@
--- ---
version: '2.0' version: '2.0'
type: direct wf:
tasks: type: direct
hello:
action: std.echo output="Hello" tasks:
publish: hello:
result: $ action: std.echo output="Hello"
publish:
result: $

55
mistralclient/tests/functional/cli/v2/cli_tests_v2.py
View File

@@ -178,11 +178,10 @@ class WorkflowCLITests(ClientTestBase):
def test_workflow_create_delete(self): def test_workflow_create_delete(self):
wf = self.mistral_command( wf = self.mistral_command(
'workflow-create', params='wf wf_tag {0}'.format(self.wf_def)) 'workflow-create', params='{0}'.format(self.wf_def))
self.assertTableStruct(wf, ['Field', 'Value']) self.assertTableStruct(wf, ['Name', 'Created at', 'Updated at'])
name = self.get_value_of_field(wf, "Name") self.assertEqual('wf', wf[0]['Name'])
self.assertEqual('wf', name)
wfs = self.mistral_command('workflow-list') wfs = self.mistral_command('workflow-list')
self.assertIn('wf', [workflow['Name'] for workflow in wfs]) self.assertIn('wf', [workflow['Name'] for workflow in wfs])
@@ -193,39 +192,27 @@ class WorkflowCLITests(ClientTestBase):
def test_workflow_update(self): def test_workflow_update(self):
self.mistral( self.mistral(
'workflow-create', params='wf wf_tag {0}'.format(self.wf_def)) 'workflow-create', params='{0}'.format(self.wf_def))
wf = self.mistral_command('workflow-update', params='wf tag') wf = self.mistral_command(
self.assertTableStruct(wf, ['Field', 'Value']) 'workflow-update', params='{0}'.format(self.wf_def))
self.assertTableStruct(wf, ['Name', 'Created at', 'Updated at'])
name = self.get_value_of_field(wf, 'Name') self.assertEqual('wf', wf[0]['Name'])
tags = self.get_value_of_field(wf, "Tags")
self.assertEqual('wf', name)
self.assertIn('tag', tags)
def test_workflow_get(self): def test_workflow_get(self):
created = self.mistral_command( created = self.mistral_command(
'workflow-create', params='wf wf_tag {0}'.format(self.wf_def)) 'workflow-create', params='{0}'.format(self.wf_def))
fetched = self.mistral_command('workflow-get', params='wf') fetched = self.mistral_command('workflow-get', params='wf')
created_wf_name = created[0]['Name']
created_wf_name = self.get_value_of_field(created, 'Name')
fetched_wf_name = self.get_value_of_field(fetched, 'Name') fetched_wf_name = self.get_value_of_field(fetched, 'Name')
self.assertEqual(created_wf_name, fetched_wf_name) self.assertEqual(created_wf_name, fetched_wf_name)
created_wf_tag = self.get_value_of_field(created, 'Tags') def test_workflow_get_definition(self):
fetched_wf_tag = self.get_value_of_field(fetched, 'Tags')
self.assertEqual(created_wf_tag, fetched_wf_tag)
def test_workflow_upload_get_definition(self):
self.mistral( self.mistral(
'workflow-create', params='wf wf_tag {0}'.format(self.wf_def)) 'workflow-create', params='{0}'.format(self.wf_def))
self.mistral(
'workflow-upload-definition',
params='wf {0}'.format(self.wf_def))
definition = self.mistral_command( definition = self.mistral_command(
'workflow-get-definition', params='wf') 'workflow-get-definition', params='wf')
@@ -368,12 +355,12 @@ class NegativeCLITests(ClientTestBase):
def test_wf_create_without_definition(self): def test_wf_create_without_definition(self):
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
self.mistral, self.mistral,
'workflow-create', params='wf tag') 'workflow-create', params='')
def test_wf_create_with_wrong_path_to_definition(self): def test_wf_create_with_wrong_path_to_definition(self):
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
self.mistral, self.mistral,
'workflow-create', params='wf tag def') 'workflow-create', params='wf')
def test_wf_delete_unexist_wf(self): def test_wf_delete_unexist_wf(self):
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
@@ -381,12 +368,7 @@ class NegativeCLITests(ClientTestBase):
def test_wf_update_unexist_wf(self): def test_wf_update_unexist_wf(self):
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
self.mistral, 'workflow-update', params='wb tag def') self.mistral, 'workflow-update', params='wf')
def test_wf_upload_definition_unexist_wf(self):
self.assertRaises(exceptions.CommandFailed,
self.mistral,
'workflow-upload-definition', params='wf')
def test_wf_get_definition_unexist_wf(self): def test_wf_get_definition_unexist_wf(self):
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
@@ -407,10 +389,11 @@ class NegativeCLITests(ClientTestBase):
self.mistral, self.mistral,
'execution-create', params='wb param {}') 'execution-create', params='wb param {}')
def test_ex_create_without_context(self): def test_ex_create_with_invalid_input(self):
self.mistral('workbook-create', params='wb') self.mistral('workbook-create', params='{0}'.format(self.wb_def))
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
self.mistral, 'execution-create', params='wb.wf1') self.mistral,
'execution-create', params="wb.wf1 input")
def test_ex_get_nonexist_execution(self): def test_ex_get_nonexist_execution(self):
self.mistral('workbook-create', params='{0}'.format(self.wb_def)) self.mistral('workbook-create', params='{0}'.format(self.wb_def))