openstack
/
cinder
Code Issues Proposed changes

Merge "Mock local directory testing for image conversion"

This commit is contained in:
Zuul 2018-03-22 00:20:33 +00:00 committed by Gerrit Code Review
parent 9e283258fe 80f9cba33e
commit fac94c1df5
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1543,12 +1543,13 @@ class CreateVolumeFlowManagerImageCacheTestCase(test.TestCase):
image_volume_cache=self.mock_cache
)
manager._create_from_image(self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service)
with mock.patch('os.path.exists', return_value=True):
manager._create_from_image(self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service)
# Make sure clone_image is always called
self.assertTrue(self.mock_driver.clone_image.called)
@ -1612,16 +1613,17 @@ class CreateVolumeFlowManagerImageCacheTestCase(test.TestCase):
image_volume_cache=self.mock_cache
)
self.assertRaises(
exception.CinderException,
manager._create_from_image,
self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service
)
with mock.patch('os.path.exists', return_value=True):
self.assertRaises(
exception.CinderException,
manager._create_from_image,
self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service
)
# Make sure clone_image is always called
self.assertTrue(self.mock_driver.clone_image.called)
@ -1743,16 +1745,17 @@ class CreateVolumeFlowManagerImageCacheTestCase(test.TestCase):
image_volume_cache=self.mock_cache
)
self.assertRaises(
exception.ImageUnacceptable,
manager._create_from_image,
self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service
)
with mock.patch('os.path.exists', return_value=True):
self.assertRaises(
exception.ImageUnacceptable,
manager._create_from_image,
self.ctxt,
volume,
image_location,
image_id,
image_meta,
self.mock_image_service
)
self.assertTrue(mock_cleanup_cg.called)
# The volume size should NOT be changed when in this case