From 35d94fd6093edfb80283d43e819bcba7c75bedbf Mon Sep 17 00:00:00 2001
From: Adriano Petrich <apetrich@redhat.com>
Date: Mon, 30 Apr 2018 09:02:44 +0100
Subject: [PATCH] Fix todo that is not needed anymore stestr conf

Stestr conf was using the wrong module name so tox would not work (I
have no idea how that passes tempest gates) So fixing that so tox works
(on an env that has tempest setup) and removed todos that the force
deletion has been merged

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

diff --git a/.stestr.conf b/.stestr.conf
index 725e36c..4554c21 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=./mistral-tempest-plugin/tests
+test_path=mistral_tempest_tests
 top_dir=./
diff --git a/mistral_tempest_tests/services/base.py b/mistral_tempest_tests/services/base.py
index 50030f2..c7baa56 100644
--- a/mistral_tempest_tests/services/base.py
+++ b/mistral_tempest_tests/services/base.py
@@ -81,16 +81,11 @@ class MistralClientBase(rest_client.RestClient):
 
     def delete_obj(self, obj, name, force=None):
         if 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}?force={force}'.format(
+                obj=obj,
+                name=name,
+                force=bool(force))
+            )
 
         return self.delete('{obj}/{name}'.format(obj=obj, name=name))