openstack/ironic
Code Issues Proposed changes

Stop overriding tempdir in unit test

Browse Source 
It may causes failure in test__prepare_variables_configdrive_file to
use a directory which doesn't exist as tempdir paramter because
interfaces using ipmitool see if the directory exists when they are
loaded. Actually, this test may fail since ipmitool vendor interface
is enabled.

This patch fixes this test to use the default tempdir.

Change-Id: I685a2aa0dcfe919b7e5318eb00f070ced6cad812
Story: #2001755
Task: #12153
This commit is contained in:
Hironori Shiina 2018-03-29 13:02:00 +09:00
parent 34e9d7d630
commit 57bca71bc6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic/tests/unit/drivers/modules/ansible/test_deploy.py
View File

@ -402,7 +402,9 @@ class TestAnsibleMethods(AnsibleDeployTestCaseBase):
i_info['configdrive'] = 'fake-content'
self.node.instance_info = i_info
self.node.save()
self.config(tempdir='/path/to/tmpfiles')
configdrive_path = ('%(tempdir)s/%(node)s.cndrive' %
{'tempdir': ansible_deploy.CONF.tempdir,
'node': self.node.uuid})
expected = {"image": {"url": "http://image",
"validate_certs": "yes",
"source": "fake-image",
@ -410,16 +412,14 @@ class TestAnsibleMethods(AnsibleDeployTestCaseBase):
"disk_format": "qcow2",
"checksum": "md5:checksum"},
'configdrive': {'type': 'file',
'location': '/path/to/tmpfiles/%s.cndrive'
% self.node.uuid}}
'location': configdrive_path}}
with mock.patch.object(ansible_deploy, 'open', mock.mock_open(),
create=True) as open_mock:
with task_manager.acquire(self.context, self.node.uuid) as task:
self.assertEqual(expected,
ansible_deploy._prepare_variables(task))
open_mock.assert_has_calls((
mock.call('/path/to/tmpfiles/%s.cndrive' % self.node.uuid,
'w'),
mock.call(configdrive_path, 'w'),
mock.call().__enter__(),
mock.call().write('fake-content'),
mock.call().__exit__(None, None, None)))