From 75ae64cf703e758cbd8a98d20f36fd17c5072ad7 Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Mon, 18 Feb 2019 00:58:18 +0200 Subject: [PATCH] Do not use VitrageError exception It's safe to not catch original exception if rollback to default template failed. Change-Id: Ibe7ec303393a229dc166b2dbc4746ec581574d9c Story: #2004053 Task: #27059 --- vitrage_tempest_plugin/tests/api/templates/base.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/vitrage_tempest_plugin/tests/api/templates/base.py b/vitrage_tempest_plugin/tests/api/templates/base.py index 1f4b25b..1000dc3 100644 --- a/vitrage_tempest_plugin/tests/api/templates/base.py +++ b/vitrage_tempest_plugin/tests/api/templates/base.py @@ -16,7 +16,6 @@ import json from oslo_log import log as logging from testtools import matchers -from vitrage.common.exception import VitrageError from vitrage_tempest_plugin.tests.base import BaseVitrageTempest from vitrage_tempest_plugin.tests.base import IsNotEmpty from vitrage_tempest_plugin.tests.common import general_utils as g_utils @@ -143,9 +142,6 @@ class BaseTemplateTest(BaseVitrageTempest): @staticmethod def _rollback_to_default(templates): - try: - for t in templates: - db_row = vitrage_utils.get_first_template(name=t) - vitrage_utils.delete_template(db_row['uuid']) - except Exception as e: - raise VitrageError('Rollback to default failed %s', e) + for t in templates: + db_row = vitrage_utils.get_first_template(name=t) + vitrage_utils.delete_template(db_row['uuid'])