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

[osm/tests.git] / robot-systest / testsuite / k8s_02-k8scluster_creation.robot

diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index 625b6f6..0c19959 100644 (file)
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -22,23 +22,18 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_02-k8scluster_creation_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 *** Test Cases ***
 Add K8s Cluster To OSM
     [Tags]   k8scluster   sanity   regression
     Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
 
-List K8s Clusters
-    [Tags]   k8scluster   sanity   regression
-    ${stdout}=    Get K8s Cluster
-    Log To Console  \n${stdout}
-
 Remove K8s Cluster from OSM
     [Tags]   k8scluster   sanity   regression
     Delete K8s Cluster  ${k8scluster_name}
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting K8s Cluster
-    Run Keyword If Test Failed  Delete K8s Cluster  ${k8scluster_name}
+    Run Keyword If Any Tests Failed  Delete K8s Cluster  ${k8scluster_name}