From 80f08595f900fecbcaec0fa09c012a8a7e168d68 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Tue, 20 Feb 2018 16:38:26 +0200 Subject: [PATCH] [ansible] use manual-mgmt hw type in unit tests less moking is always better. Change-Id: Ibb9e755920333cb7a8778e6f72f7b1df36b7afb2 --- .../drivers/modules/ansible/test_deploy.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py index 02dddd98c1..675a579d23 100644 --- a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py +++ b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py @@ -56,22 +56,13 @@ class AnsibleDeployTestCaseBase(db_base.DbTestCase): def setUp(self): super(AnsibleDeployTestCaseBase, self).setUp() - # NOTE(pas-ha) we load ipmi hw type, and ipmitool interface checks - # for validity of the CONF.tempdir when a task object is created. - # We need to fake it in some tests and we don't care if and how it - # was called, so just mock it out. - # TODO(pas-ha) replace impi hw type with more appropriate fake hw type - # when such becomes available - patcher = mock.patch('ironic.common.utils.check_dir', autospec=True) - patcher.start() - self.addCleanup(patcher.stop) - - self.config(enabled_deploy_interfaces='direct,iscsi,ansible') - mgr_utils.mock_the_extension_manager(driver='ipmi', + self.config(enabled_deploy_interfaces='ansible', + enabled_power_interfaces='fake', + enabled_management_interfaces='fake') + mgr_utils.mock_the_extension_manager(driver='manual-management', namespace='ironic.hardware.types') node = { - 'driver': 'ipmi', - 'deploy_interface': 'ansible', + 'driver': 'manual-management', 'instance_info': INSTANCE_INFO, 'driver_info': DRIVER_INFO, 'driver_internal_info': DRIVER_INTERNAL_INFO,