From 6deb96c89d9689912a37ce8e1907c9f0cdf8fbfc Mon Sep 17 00:00:00 2001
From: Adriano Petrich <apetrich@redhat.com>
Date: Wed, 16 May 2018 08:00:41 +0000
Subject: [PATCH] Revert "Fix todo that is not needed anymore stestr conf"

This reverts commit 35d94fd6093edfb80283d43e819bcba7c75bedbf.

Removing the try except makes tempest not stable branch invariant and break backports.
this fixes that

Change-Id: Ib78ca25ff25addd4c19716e59f6e638dabdc7054
---
 .stestr.conf                           |  2 +-
 mistral_tempest_tests/services/base.py | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.stestr.conf b/.stestr.conf
index 4554c21..725e36c 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=mistral_tempest_tests
+test_path=./mistral-tempest-plugin/tests
 top_dir=./
diff --git a/mistral_tempest_tests/services/base.py b/mistral_tempest_tests/services/base.py
index c7baa56..50030f2 100644
--- a/mistral_tempest_tests/services/base.py
+++ b/mistral_tempest_tests/services/base.py
@@ -81,11 +81,16 @@ class MistralClientBase(rest_client.RestClient):
 
     def delete_obj(self, obj, name, force=None):
         if force:
-            return self.delete('{obj}/{name}?force={force}'.format(
-                obj=obj,
-                name=name,
-                force=bool(force))
-            )
+            # TODO(apetrich) This try except is a partial implementation
+            # to be removed once force deletion lands in mistral
+            try:
+                return self.delete('{obj}/{name}?force={force}'.format(
+                    obj=obj,
+                    name=name,
+                    force=bool(force))
+                )
+            except Exception:
+                pass
 
         return self.delete('{obj}/{name}'.format(obj=obj, name=name))