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

[osm/tests.git] / robot-systest / testsuite / basic_12-ns_primitives.robot

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index 7dcc719..0785467 100644 (file)
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -24,7 +24,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_12-ns_primitives_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -94,10 +94,10 @@ Delete VNF Descriptors
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptor and instance
 
-    Run Keyword If Test Failed  Delete NS   ${ns_name}
-    Run Keyword If Test Failed  Delete NSD   ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name1}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name2}
+    Run Keyword If Any Tests Failed  Delete NS   ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name1}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name2}