openstack
/
cinder
Code Issues Proposed changes

Merge "Fix test_create_volume_flow test issue"

This commit is contained in:
Jenkins 2016-03-03 01:17:39 +00:00 committed by Gerrit Code Review
parent 5f24b4dbb2 53e35b3737
commit eadc4a4fa8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/flows/test_create_volume_flow.py
View File

@ -42,7 +42,6 @@ class CreateVolumeFlowTestCase(test.TestCase):
def setUp(self):
super(CreateVolumeFlowTestCase, self).setUp()
self.ctxt = context.get_admin_context()
self.counter = float(0)
# Ensure that time.time() always returns more than the last time it was
# called to avoid div by zero errors.
@ -50,10 +49,11 @@ class CreateVolumeFlowTestCase(test.TestCase):
@mock.patch('cinder.objects.Volume.get_by_id')
@mock.patch('cinder.volume.utils.extract_host')
@mock.patch('time.time', side_effect=time_inc)
@mock.patch('time.time')
@mock.patch('cinder.objects.ConsistencyGroup.get_by_id')
def test_cast_create_volume(self, consistencygroup_get_by_id, mock_time,
mock_extract_host, volume_get_by_id):
mock_time.side_effect = self.time_inc
volume = fake_volume.fake_volume_obj(self.ctxt)
volume_get_by_id.return_value = volume
props = {}