Wait for complete deletion of volume snapshot before deleting volume
In file tempest/scenario/test_volume_boot_pattern.py there
is a method for creating snapshots from volumes. The method
is _create_snapshot_from_volume(...). The thing is that method
_create_snapshot_from_volume(...) uses method
self.addCleanup_with_wait(...) (that does not wait for complete
resource deletion right after sending the request to delete the
resource) in order to delete created volume snapshot after the test
finished. But volumes cannot be deleted when there are outstanding
snapshots. Therefore we should wait for complete deletion of
the volume snapshot before we start to delete the volume.
Closes-Bug: #1441563
Change-Id: I11207c3ac9296389c5e195b2296fc47e65a7486c
diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 5bc24ea..cda7daa 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -73,11 +73,9 @@
volume_id=vol_id,
force=True,
display_name=snap_name)
- self.addCleanup_with_wait(
- waiter_callable=self.snapshots_client.wait_for_resource_deletion,
- thing_id=snap['id'], thing_id_param='id',
- cleanup_callable=self.delete_wrapper,
- cleanup_args=[self.snapshots_client.delete_snapshot, snap['id']])
+ self.addCleanup(
+ self.snapshots_client.wait_for_resource_deletion, snap['id'])
+ self.addCleanup(self.snapshots_client.delete_snapshot, snap['id'])
self.snapshots_client.wait_for_snapshot_status(snap['id'], 'available')
self.assertEqual(snap_name, snap['display_name'])
return snap