openstack/vitrage-tempest-plugin
Code Issues Proposed changes

reduce api tests runtime.

Browse Source 
Tests trying to create error template should not wait for active

Change-Id: I4ad14715d9de0f65f85e912132d4deaad0369f2c
This commit is contained in:
Idan Hefetz 2018-07-26 11:44:05 +00:00
parent daa4dc1782
commit dfcb81a546
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vitrage_tempest_plugin/tests/api/templates/test_template.py
View File

@ -180,8 +180,6 @@ class TemplatesDBTest(BaseTemplateTest):
# TODO(ikinory): add folder of templates
# Add standard ,equivalence and definition templates
templates_names = self._add_templates()
v_utils.add_template(STANDARD_TEMPLATE,
template_type=TTypes.STANDARD)
# assert standard template
db_row = v_utils.get_first_template(
name='host_high_memory_usage_scenarios', type=TTypes.STANDARD)
@ -306,7 +304,8 @@ class TemplatesDBTest(BaseTemplateTest):
v_utils.add_template(DEFINITION_TEMPLATE,
template_type=TTypes.DEFINITION)
v_utils.add_template(STANDARD_ERROR,
template_type=TTypes.STANDARD)
template_type=TTypes.STANDARD,
status=TemplateStatus.ERROR)
return ['host_high_memory_usage_scenarios',
'entity equivalence example',
'basic_def_template',

5
vitrage_tempest_plugin/tests/common/vitrage_utils.py
View File

@ -68,14 +68,15 @@ def get_first_instance(**kwargs):
def add_template(filename='',
folder='templates/api',
template_type=TemplateTypes.STANDARD):
template_type=TemplateTypes.STANDARD,
status=TemplateStatus.ACTIVE):
full_path = g_utils.tempest_resources_dir() + '/' + folder + '/' + filename
t = TempestClients.vitrage().template.add(full_path, template_type)
if t and t[0]:
wait_for_status(
100,
get_first_template,
uuid=t[0]['uuid'], status=TemplateStatus.ACTIVE)
uuid=t[0]['uuid'], status=status)
return t[0]
return None