openstack/cinder
Code Issues Proposed changes

Merge "Tests: Fix racy volume unit test"

Browse Source
This commit is contained in:
Jenkins 2016-08-28 21:54:25 +00:00 committed by Gerrit Code Review
commit e6642d97fd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/unit/test_volume.py
View File

@ -1161,7 +1161,13 @@ class VolumeTestCase(BaseVolumeTestCase):
db.volume_update(self.context, volume['id'], {'status': 'available'}) db.volume_update(self.context, volume['id'], {'status': 'available'})
self.volume_api.delete(self.context, volume) self.volume_api.delete(self.context, volume)
volume = db.volume_get(self.context, volume['id']) volume = objects.Volume.get_by_id(self.context, volume.id)
while volume.status == 'available':
# Must wait for volume_api delete request to process enough to
# change the volume status.
time.sleep(0.5)
volume.refresh()
self.assertEqual('deleting', volume['status']) self.assertEqual('deleting', volume['status'])
db.volume_destroy(self.context, volume['id']) db.volume_destroy(self.context, volume['id'])