commit 263d551edef01eb654c7f32e6821e3caec5f1ea3
author Jenkins <jenkins@review.openstack.org> Wed Sep 06 10:40:03 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 06 10:40:03 2017 +0000
tree 35ee088de1c79c859fd5647393c47f7ec7019ff9
parent 4747708c017616fec767c597015bf88597c0d9f3
parent 4315b63b7398405692f03a4fde777a3c16078e98

Merge "Fix addCleanup order in test_volume_list_param_tenant"

tempest/api/volume/admin/test_volumes_list.py

diff --git a/tempest/api/volume/admin/test_volumes_list.py b/tempest/api/volume/admin/test_volumes_list.py
index 9d98b7a..6ce4a85 100644
--- a/tempest/api/volume/admin/test_volumes_list.py
+++ b/tempest/api/volume/admin/test_volumes_list.py
@@ -45,9 +45,9 @@
         # Create a volume in admin tenant
         adm_vol = self.admin_volume_client.create_volume(
             size=CONF.volume.volume_size)['volume']
+        self.addCleanup(self.admin_volume_client.delete_volume, adm_vol['id'])
         waiters.wait_for_volume_resource_status(self.admin_volume_client,
                                                 adm_vol['id'], 'available')
-        self.addCleanup(self.admin_volume_client.delete_volume, adm_vol['id'])
         params = {'all_tenants': 1,
                   'project_id': self.volumes_client.tenant_id}
         # Getting volume list from primary tenant using admin credentials