X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fquotas_01-quota_enforcement.robot;h=e0cb576cacc8bdc9c9c3da19d9e30908a8b4a539;hb=d225e550e79fdbb9f667975102b17232eca893c1;hp=a3ad7f5ed501709114e07af257f70e906efa582f;hpb=15589053373c07bea08a52a6fc8dbcd6d80603ac;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index a3ad7f5..e0cb576 100644
--- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot
+++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/quotas_01-quota_enforcement_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -157,14 +157,14 @@ Delete Third Project
 
 
 *** Keywords ***
-Test Cleanup
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_2_name}   vp2_1   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v1   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v2   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v3   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v4   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v5   ${user_name}   ${user_password}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete Project  ${project_1_name}
-    Run Keyword If Test Failed  Delete Project  ${project_2_name}
-    Run Keyword If Test Failed  Run Keyword And Ignore Error  Delete Project  ${project_3_name}
+Suite Cleanup
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_2_name}   vp2_1   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v1   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v2   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v3   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v4   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete VNFD In Project  ${project_3_name}   v5   ${user_name}   ${user_password}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${project_1_name}
+    Run Keyword If Any Tests Failed  Delete Project  ${project_2_name}
+    Run Keyword If Any Tests Failed  Run Keyword And Ignore Error  Delete Project  ${project_3_name}
     Run And Return RC   osm user-delete ${user_name}