commit 253585dcc6811b0fdbc615336edc7606d4262ebc
author Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> Wed Mar 19 12:08:39 2014 -0400
committer Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> Wed Mar 19 12:08:39 2014 -0400
tree 588150e49523cf77fcaad70370ac13b3b2fb32b4
parent 27a8c5641d4d419e6e67ed22333a159527356760

Add server to clean up even in case of errors

In the case of instance build times out it would never been added to cleanup so
we put it on the list before wait for it get ready.

Fixes bug #1292641

Change-Id: Id030457cfe038849b81008de18b5f93fc024a47e

tempest/api/volume/test_volumes_snapshots.py

diff --git a/tempest/api/volume/test_volumes_snapshots.py b/tempest/api/volume/test_volumes_snapshots.py
index 2701e84..84c9501 100644
--- a/tempest/api/volume/test_volumes_snapshots.py
+++ b/tempest/api/volume/test_volumes_snapshots.py
@@ -71,8 +71,8 @@
         resp, server = self.servers_client.create_server(server_name,
                                                          self.image_ref,
                                                          self.flavor_ref)
-        self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
         self.addCleanup(self.servers_client.delete_server, server['id'])
+        self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
         mountpoint = '/dev/%s' % CONF.compute.volume_device_name
         resp, body = self.volumes_client.attach_volume(
             self.volume_origin['id'], server['id'], mountpoint)