Merge "Wait for complete deletion of volume snapshot before deleting volume"

This commit is contained in:
Jenkins 2015-04-30 11:36:33 +00:00 committed by Gerrit Code Review
commit 7daa4d10d7

View File

@ -73,11 +73,9 @@ class TestVolumeBootPattern(manager.ScenarioTest):
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