summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2016-06-20 07:38:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-20 07:38:45 +0000
commit59fb6475a39de162a8c72d8904a494eabe6d39b4 (patch)
treebc9410dc5e6b7e3d2de5af2ef47b2a25de178988
parent9f57b74905ab38bb0434c0a48b13752870b5b953 (diff)
parent1b42fe2306b18996f53e5d987d7c5d106a7325f3 (diff)
Merge "Before deleting the instance, check if the instance exists"
-rwxr-xr-xtests/run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/run.sh b/tests/run.sh
index d476f33e..56bacca7 100755
--- 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