commit 5b6ce4966e4bd2dc6d2dd1b7d1a4ccd8c0bf3369
author Jenkins <jenkins@review.openstack.org> Thu Mar 20 23:17:24 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 20 23:17:24 2014 +0000
tree 64975701726b6403811d92cf0c45624aceb1b99d
parent 2740b93229ae151749f62a08e4a455c77a5fc679
parent 253585dcc6811b0fdbc615336edc7606d4262ebc

Merge "Add server to clean up even in case of errors"

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)