openstack/nova
Code Issues Proposed changes

Split up test_is_volume_backed_instance() into five functions

Browse Source 
test_is_volume_backed_instance() actually did five tests with
different object instances and test cases.  This is split up into
five separate functions with reasonable names.

Change-Id: Iba51e48413e2744ff789c8761bc9188238deb98b
This commit is contained in:
Sven Anderson
2015-11-07 20:21:48 +01:00
parent 4474dce9e6
commit 77e80d6873
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/tests/unit/compute/test_compute.py
View File

@@ -8929,19 +8929,24 @@ class ComputeAPITestCase(BaseTestCase):
self.assertIsNone(
self.compute_api._volume_size(inst_type, blank_bdm))
def test_is_volume_backed_instance(self):
def test_is_volume_backed_instance_no_image(self):
ctxt = self.context
instance = self._create_fake_instance_obj({'image_ref': ''})
self.assertTrue(
self.compute_api.is_volume_backed_instance(ctxt, instance, None))
def test_is_volume_backed_instance_no_bdm(self):
ctxt = self.context
instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
self.assertFalse(
self.compute_api.is_volume_backed_instance(
ctxt, instance,
block_device_obj.block_device_make_list(ctxt, [])))
def test_is_volume_backed_instance_bdm_volume(self):
ctxt = self.context
instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
bdms = block_device_obj.block_device_make_list(ctxt,
[fake_block_device.FakeDbBlockDeviceDict(
{'source_type': 'volume',
@@ -8952,6 +8957,9 @@ class ComputeAPITestCase(BaseTestCase):
self.assertTrue(
self.compute_api.is_volume_backed_instance(ctxt, instance, bdms))
def test_is_volume_backed_instance_bdm_local(self):
ctxt = self.context
instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
bdms = block_device_obj.block_device_make_list(ctxt,
[fake_block_device.FakeDbBlockDeviceDict(
{'source_type': 'volume',
@@ -8970,6 +8978,9 @@ class ComputeAPITestCase(BaseTestCase):
self.assertFalse(
self.compute_api.is_volume_backed_instance(ctxt, instance, bdms))
def test_is_volume_backed_instance_bdm_snapshot(self):
ctxt = self.context
instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
bdms = block_device_obj.block_device_make_list(ctxt,
[fake_block_device.FakeDbBlockDeviceDict(
{'source_type': 'volume',