From dfcb81a546f012b4f34f1a565d301787d756b6fd Mon Sep 17 00:00:00 2001 From: Idan Hefetz Date: Thu, 26 Jul 2018 11:44:05 +0000 Subject: [PATCH] reduce api tests runtime. Tests trying to create error template should not wait for active Change-Id: I4ad14715d9de0f65f85e912132d4deaad0369f2c --- vitrage_tempest_plugin/tests/api/templates/test_template.py | 5 ++--- vitrage_tempest_plugin/tests/common/vitrage_utils.py | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vitrage_tempest_plugin/tests/api/templates/test_template.py b/vitrage_tempest_plugin/tests/api/templates/test_template.py index 4aa63b7..a67c4b9 100644 --- a/vitrage_tempest_plugin/tests/api/templates/test_template.py +++ b/vitrage_tempest_plugin/tests/api/templates/test_template.py @@ -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', diff --git a/vitrage_tempest_plugin/tests/common/vitrage_utils.py b/vitrage_tempest_plugin/tests/common/vitrage_utils.py index 45af1e8..1d8fbfb 100644 --- a/vitrage_tempest_plugin/tests/common/vitrage_utils.py +++ b/vitrage_tempest_plugin/tests/common/vitrage_utils.py @@ -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