X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Ftest_teardown.robot;h=e130038fbcf33376c476dc634f8a350e9b6892d3;hp=cad3c620e072c3dd672376dd28fe0443bedc84a1;hb=8f41f1d040453d963440d8cc99fb2b957521120b;hpb=248d1a52e06622dc9eb1dfdd6ca9f6670b4c0bc3

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index cad3c620e0..e130038fbc 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -65,7 +65,9 @@
 | | ... | Additional teardown for tests which uses vhost(s) and VM(s).
 | | ...
 | | Show VPP vhost on all DUTs | ${nodes}
-| | vnf_manager.Kill All VMs
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
 
 | Additional Test Tear Down Action For nat
 | | [Documentation]