Improvement de la suppression du vhost de test

etna-alternance · Mar 4, 2020 · 9eed5c8 · 9eed5c8
1 parent 536d01f
commit 9eed5c8
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/src/RabbitContext.php b/src/RabbitContext.php
@@ -36,6 +36,12 @@ public static function createVhosts()
         foreach (self::$vhosts as $vhost) {
             $vhost = str_replace('/', '%2f', $vhost);
 
+            try {
+                $client->delete("/api/vhosts/{$vhost}");
+            } catch (\Exception $e) {
+                // On ignore l'exception car le vhost n'existe peut être pas mais dans le doute on le supprime
+            }
+
             $client->put("/api/vhosts/{$vhost}");
             $client->put(
                 "/api/permissions/{$vhost}/guest",
@@ -50,20 +56,6 @@ public static function createVhosts()
         }
     }
 
-    /**
-     * @AfterSuite
-     */
-    public static function deleteVhosts()
-    {
-        $client = self::getRabbitMqClient();
-
-        foreach (self::$vhosts as $vhost) {
-            $vhost = str_replace('/', '%2f', $vhost);
-            $client->delete("/api/vhosts/{$vhost}");
-        }
-    }
-
-
     /**
      * @Given /le producer "([^"]*)" devrait avoir publié un message dans la queue "([^"]*)"$/
      */