Renamed Test Cleanup to Suite Cleanup; fix teardown to work properly in test suites
Change-Id: I4f8369b7f99d4d34a61f2b6ca58fa8a02feba01b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot
index 2f531cb..5dac832 100644
--- a/robot-systest/testsuite/slice_01-network_slicing.robot
+++ b/robot-systest/testsuite/slice_01-network_slicing.robot
@@ -30,7 +30,7 @@
Variables %{ROBOT_DEVOPS_FOLDER}/resources/slice_01-network_slicing_data.py
-Suite Teardown Run Keyword And Ignore Error Test Cleanup
+Suite Teardown Run Keyword And Ignore Error Suite Cleanup
*** Variables ***
@@ -172,16 +172,16 @@
*** Keywords ***
-Test Cleanup
+Suite Cleanup
[Documentation] Test Suit Cleanup: Deleting Descriptors, instance and template
- Run Keyword If Test Failed Delete NST ${nst_name}
+ Run Keyword If Any Tests Failed Delete NST ${nst_name}
- Run Keyword If Test Failed Delete NSD ${nsd1_name}
- Run Keyword If Test Failed Delete NSD ${nsd2_name}
+ Run Keyword If Any Tests Failed Delete NSD ${nsd1_name}
+ Run Keyword If Any Tests Failed Delete NSD ${nsd2_name}
- Run Keyword If Test Failed Delete VNFD ${vnfd1_name}
- Run Keyword If Test Failed Delete VNFD ${vnfd2_name}
+ Run Keyword If Any Tests Failed Delete VNFD ${vnfd1_name}
+ Run Keyword If Any Tests Failed Delete VNFD ${vnfd2_name}