Fix unit tests failing with ironic-lib 2.1.1
The unit tests for deploy_disk_image are peering into the internals of ironic-lib, which they shouldn't do. Update the unit tests to make them work and leave notes that these unit tests should be re-worked. Change-Id: Id1b43e3a02670b95ced15ef34ce4bc15f9312cde Closes-Bug: #1632762
This commit is contained in:
John L. Villalovos
parent
fd089b0a01
commit
3110fa8594
@ -336,6 +336,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
parent_mock.attach_mock(mocker, name)
|
||||
return parent_mock
|
||||
|
||||
# FIXME(jlvillal): This test should not be checking on the inner-workings
|
||||
# of ironic-lib code, as it currently does. It should be re-written to just
|
||||
# mock ironic_lib.disk_utils.work_on_disk(). Ensure that ironic-lib is
|
||||
# correctly unit testing the function first.
|
||||
def _test_deploy_partition_image(self, boot_option=None,
|
||||
boot_mode=None, disk_label=None):
|
||||
"""Check loosely all functions are called with right args."""
|
||||
@ -360,7 +364,7 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
'logout_iscsi', 'delete_iscsi']
|
||||
|
||||
disk_utils_name_list = ['is_block_device', 'get_image_mb',
|
||||
'make_partitions', 'populate_image', 'mkfs',
|
||||
'make_partitions', 'populate_image',
|
||||
'block_uuid', 'destroy_disk_metadata']
|
||||
|
||||
utils_mock = self._mock_calls(utils_name_list, utils)
|
||||
@ -373,6 +377,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
disk_utils_mock.make_partitions.return_value = {'root': root_part,
|
||||
'swap': swap_part}
|
||||
|
||||
ironic_lib_utils_name_list = ['mkfs']
|
||||
ironic_lib_utils_mock = self._mock_calls(ironic_lib_utils_name_list,
|
||||
ironic_utils)
|
||||
|
||||
make_partitions_expected_args = [dev, root_mb, swap_mb, ephemeral_mb,
|
||||
configdrive_mb, node_uuid]
|
||||
make_partitions_expected_kwargs = {'commit': True,
|
||||
@ -411,9 +419,6 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
mock.call.is_block_device(swap_part),
|
||||
mock.call.populate_image(
|
||||
image_path, root_part),
|
||||
mock.call.mkfs(
|
||||
dev=swap_part, fs='swap',
|
||||
label='swap1'),
|
||||
mock.call.block_uuid(root_part)]
|
||||
|
||||
uuids_dict_returned = utils.deploy_partition_image(
|
||||
@ -422,6 +427,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
|
||||
self.assertEqual(utils_calls_expected, utils_mock.mock_calls)
|
||||
self.assertEqual(disk_utils_calls_expected, disk_utils_mock.mock_calls)
|
||||
ironic_lib_utils_calls_expected = [
|
||||
mock.call.mkfs(fs='swap', label='swap1', path='/dev/fake-part1')]
|
||||
self.assertEqual(ironic_lib_utils_calls_expected,
|
||||
ironic_lib_utils_mock.mock_calls)
|
||||
expected_uuid_dict = {
|
||||
'root uuid': root_uuid,
|
||||
'efi system partition uuid': None}
|
||||
@ -476,6 +485,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
|
||||
gim_mock.assert_called_once_with(image_path)
|
||||
|
||||
# FIXME(jlvillal): This test should not be checking on the inner-workings
|
||||
# of ironic-lib code, as it currently does. It should be re-written to just
|
||||
# mock ironic_lib.disk_utils.work_on_disk(). Ensure that ironic-lib is
|
||||
# correctly unit testing the function first.
|
||||
# We mock utils.block_uuid separately here because we can't predict
|
||||
# the order in which it will be called.
|
||||
@mock.patch.object(disk_utils, 'block_uuid', autospec=True)
|
||||
@ -504,7 +517,7 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
'logout_iscsi', 'delete_iscsi']
|
||||
|
||||
disk_utils_name_list = ['get_image_mb', 'make_partitions',
|
||||
'is_block_device', 'populate_image', 'mkfs',
|
||||
'is_block_device', 'populate_image',
|
||||
'destroy_disk_metadata']
|
||||
|
||||
utils_mock = self._mock_calls(utils_name_list, utils)
|
||||
@ -514,6 +527,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
disk_utils_mock.get_image_mb.return_value = 1
|
||||
disk_utils_mock.is_block_device.return_value = True
|
||||
|
||||
ironic_lib_utils_name_list = ['mkfs']
|
||||
ironic_lib_utils_mock = self._mock_calls(ironic_lib_utils_name_list,
|
||||
ironic_utils)
|
||||
|
||||
def block_uuid_side_effect(device):
|
||||
if device == root_part:
|
||||
return root_uuid
|
||||
@ -549,14 +566,8 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
mock.call.is_block_device(swap_part),
|
||||
mock.call.is_block_device(
|
||||
efi_system_part),
|
||||
mock.call.mkfs(
|
||||
dev=efi_system_part, fs='vfat',
|
||||
label='efi-part'),
|
||||
mock.call.populate_image(
|
||||
image_path, root_part),
|
||||
mock.call.mkfs(
|
||||
dev=swap_part, fs='swap',
|
||||
label='swap1')]
|
||||
image_path, root_part)]
|
||||
|
||||
uuid_dict_returned = utils.deploy_partition_image(
|
||||
address, port, iqn, lun, image_path, root_mb, swap_mb,
|
||||
@ -565,6 +576,12 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
|
||||
self.assertEqual(utils_calls_expected, utils_mock.mock_calls)
|
||||
self.assertEqual(disk_utils_calls_expected, disk_utils_mock.mock_calls)
|
||||
ironic_lib_utils_calls_expected = [
|
||||
mock.call.mkfs(fs='vfat', label='efi-part',
|
||||
path='/dev/fake-part1'),
|
||||
mock.call.mkfs(fs='swap', label='swap1', path='/dev/fake-part2')]
|
||||
self.assertEqual(ironic_lib_utils_calls_expected,
|
||||
ironic_lib_utils_mock.mock_calls)
|
||||
|
||||
block_uuid_mock.assert_any_call('/dev/fake-part1')
|
||||
block_uuid_mock.assert_any_call('/dev/fake-part3')
|
||||
@ -640,6 +657,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
self.assertEqual(disk_utils_calls_expected, disk_utils_mock.mock_calls)
|
||||
self.assertEqual(root_uuid, uuid_dict_returned['root uuid'])
|
||||
|
||||
# FIXME(jlvillal): This test should not be checking on the inner-workings
|
||||
# of ironic-lib code, as it currently does. It should be re-written to just
|
||||
# mock ironic_lib.disk_utils.work_on_disk(). Ensure that ironic-lib is
|
||||
# correctly unit testing the function first.
|
||||
def test_deploy_partition_image_with_ephemeral(self):
|
||||
"""Check loosely all functions are called with right args."""
|
||||
address = '127.0.0.1'
|
||||
@ -664,7 +685,7 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
'logout_iscsi', 'delete_iscsi']
|
||||
|
||||
disk_utils_name_list = ['get_image_mb', 'make_partitions',
|
||||
'is_block_device', 'populate_image', 'mkfs',
|
||||
'is_block_device', 'populate_image',
|
||||
'block_uuid', 'destroy_disk_metadata']
|
||||
|
||||
utils_mock = self._mock_calls(utils_name_list, utils)
|
||||
@ -678,6 +699,11 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
'swap': swap_part,
|
||||
'ephemeral': ephemeral_part,
|
||||
'root': root_part}
|
||||
|
||||
ironic_lib_utils_name_list = ['mkfs']
|
||||
ironic_lib_utils_mock = self._mock_calls(ironic_lib_utils_name_list,
|
||||
ironic_utils)
|
||||
|
||||
utils_calls_expected = [mock.call.get_dev(address, port, iqn, lun),
|
||||
mock.call.discovery(address, port),
|
||||
mock.call.login_iscsi(address, port, iqn),
|
||||
@ -701,13 +727,6 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
mock.call.is_block_device(ephemeral_part),
|
||||
mock.call.populate_image(
|
||||
image_path, root_part),
|
||||
mock.call.mkfs(
|
||||
dev=swap_part, fs='swap',
|
||||
label='swap1'),
|
||||
mock.call.mkfs(
|
||||
dev=ephemeral_part,
|
||||
fs=ephemeral_format,
|
||||
label='ephemeral0'),
|
||||
mock.call.block_uuid(root_part)]
|
||||
|
||||
uuid_dict_returned = utils.deploy_partition_image(address, port, iqn,
|
||||
@ -720,7 +739,17 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
self.assertEqual(utils_calls_expected, utils_mock.mock_calls)
|
||||
self.assertEqual(disk_utils_calls_expected, disk_utils_mock.mock_calls)
|
||||
self.assertEqual(root_uuid, uuid_dict_returned['root uuid'])
|
||||
ironic_lib_utils_calls_expected = [
|
||||
mock.call.mkfs(fs='swap', label='swap1', path='/dev/fake-part2'),
|
||||
mock.call.mkfs(fs='exttest', label='ephemeral0',
|
||||
path='/dev/fake-part1')]
|
||||
self.assertEqual(ironic_lib_utils_calls_expected,
|
||||
ironic_lib_utils_mock.mock_calls)
|
||||
|
||||
# FIXME(jlvillal): This test should not be checking on the inner-workings
|
||||
# of ironic-lib code, as it currently does. It should be re-written to just
|
||||
# mock ironic_lib.disk_utils.work_on_disk(). Ensure that ironic-lib is
|
||||
# correctly unit testing the function first.
|
||||
def test_deploy_partition_image_preserve_ephemeral(self):
|
||||
"""Check if all functions are called with right args."""
|
||||
address = '127.0.0.1'
|
||||
@ -744,7 +773,7 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
utils_name_list = ['get_dev', 'discovery', 'login_iscsi',
|
||||
'delete_iscsi', 'logout_iscsi']
|
||||
disk_utils_name_list = ['make_partitions', 'get_image_mb',
|
||||
'is_block_device', 'populate_image', 'mkfs',
|
||||
'is_block_device', 'populate_image',
|
||||
'block_uuid', 'get_dev_block_size']
|
||||
|
||||
utils_mock = self._mock_calls(utils_name_list, utils)
|
||||
@ -760,6 +789,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
'root': root_part}
|
||||
disk_utils_mock.block_uuid.return_value = root_uuid
|
||||
|
||||
ironic_lib_utils_name_list = ['mkfs']
|
||||
ironic_lib_utils_mock = self._mock_calls(ironic_lib_utils_name_list,
|
||||
ironic_utils)
|
||||
|
||||
utils_calls_expected = [mock.call.get_dev(address, port, iqn, lun),
|
||||
mock.call.discovery(address, port),
|
||||
mock.call.login_iscsi(address, port, iqn),
|
||||
@ -781,9 +814,6 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
mock.call.is_block_device(ephemeral_part),
|
||||
mock.call.populate_image(
|
||||
image_path, root_part),
|
||||
mock.call.mkfs(
|
||||
dev=swap_part, fs='swap',
|
||||
label='swap1'),
|
||||
mock.call.block_uuid(root_part)]
|
||||
|
||||
uuid_dict_returned = utils.deploy_partition_image(
|
||||
@ -794,6 +824,10 @@ class PhysicalWorkTestCase(tests_base.TestCase):
|
||||
self.assertEqual(disk_utils_calls_expected, disk_utils_mock.mock_calls)
|
||||
self.assertFalse(disk_utils_mock.get_dev_block_size.called)
|
||||
self.assertEqual(root_uuid, uuid_dict_returned['root uuid'])
|
||||
ironic_lib_utils_calls_expected = [
|
||||
mock.call.mkfs(fs='swap', label='swap1', path='/dev/fake-part2')]
|
||||
self.assertEqual(ironic_lib_utils_calls_expected,
|
||||
ironic_lib_utils_mock.mock_calls)
|
||||
|
||||
@mock.patch.object(ironic_utils, 'unlink_without_raise', autospec=True)
|
||||
def test_deploy_partition_image_with_configdrive(self, mock_unlink):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user