Merge "Before deleting the instance, check if the instance exists"

diff --git a/tests/run.sh b/tests/run.sh
index d476f33..56bacca 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -226,7 +226,7 @@ cleanup() {
 
     python ./nova_force_down.py "$COMPUTE_HOST" --unset
     sleep 1
-    nova delete "$VM_NAME"
+    nova list | grep -q " $VM_NAME " && nova delete "$VM_NAME"
     sleep 1
     alarm_id=$(ceilometer alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
     sleep 1