Browse Source

Revert "Fix todo that is not needed anymore stestr conf"

This reverts commit 35d94fd609.

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

Change-Id: Ib78ca25ff25addd4c19716e59f6e638dabdc7054
Adriano Petrich 1 year ago
parent
commit
6deb96c89d
2 changed files with 11 additions and 6 deletions
  1. 1
    1
      .stestr.conf
  2. 10
    5
      mistral_tempest_tests/services/base.py

+ 1
- 1
.stestr.conf View File

@@ -1,3 +1,3 @@
1 1
 [DEFAULT]
2
-test_path=mistral_tempest_tests
2
+test_path=./mistral-tempest-plugin/tests
3 3
 top_dir=./

+ 10
- 5
mistral_tempest_tests/services/base.py View File

@@ -81,11 +81,16 @@ class MistralClientBase(rest_client.RestClient):
81 81
 
82 82
     def delete_obj(self, obj, name, force=None):
83 83
         if force:
84
-            return self.delete('{obj}/{name}?force={force}'.format(
85
-                obj=obj,
86
-                name=name,
87
-                force=bool(force))
88
-            )
84
+            # TODO(apetrich) This try except is a partial implementation
85
+            # to be removed once force deletion lands in mistral
86
+            try:
87
+                return self.delete('{obj}/{name}?force={force}'.format(
88
+                    obj=obj,
89
+                    name=name,
90
+                    force=bool(force))
91
+                )
92
+            except Exception:
93
+                pass
89 94
 
90 95
         return self.delete('{obj}/{name}'.format(obj=obj, name=name))
91 96
 

Loading…
Cancel
Save