Renamed Test Cleanup to Suite Cleanup; fix teardown to work properly in test suites

[osm/tests.git] / robot-systest / testsuite / quotas_01-quota_enforcement.robot

diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index a3ad7f5..e0cb576 100644 (file)
--- 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}