openstack/ironic
Code Issues Proposed changes

Merge "Minor docstring and unittests fixes for IPMIConsole"

Browse Source
This commit is contained in:
Jenkins 2016-08-02 22:51:52 +00:00 committed by Gerrit Code Review
commit 49b5027158
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/ipmitool.py
View File

@ -1135,7 +1135,7 @@ class IPMIConsole(base.ConsoleInterface):
def _start_console(self, driver_info, start_method): def _start_console(self, driver_info, start_method):
"""Start a remote console for the node. """Start a remote console for the node.
:param task: a task from TaskManager :param driver_info: the parameters for accessing a node
:param start_method: console_utils method to start console :param start_method: console_utils method to start console
:raises: InvalidParameterValue if required ipmi parameters are missing :raises: InvalidParameterValue if required ipmi parameters are missing
:raises: PasswordFileFailedToCreate if unable to create a file :raises: PasswordFileFailedToCreate if unable to create a file

4
ironic/tests/unit/drivers/modules/test_ipmitool.py
View File

@ -193,7 +193,7 @@ class IPMIToolCheckInitTestCase(base.TestCase):
ipmi.TMP_DIR_CHECKED = True ipmi.TMP_DIR_CHECKED = True
ipmi.IPMISocatConsole() ipmi.IPMISocatConsole()
mock_support.assert_called_with(mock.ANY) mock_support.assert_called_with(mock.ANY)
self.assertFalse(mock_check_dir.call_count) self.assertFalse(mock_check_dir.called)
@mock.patch.object(ipmi, '_is_option_supported', autospec=True) @mock.patch.object(ipmi, '_is_option_supported', autospec=True)
@ -2236,7 +2236,7 @@ class IPMIToolSocatDriverTestCase(IPMIToolDriverTestCase):
mock_stop.assert_called_once_with(self.node.uuid) mock_stop.assert_called_once_with(self.node.uuid)
mock_unlink.assert_called_once_with( mock_unlink.assert_called_once_with(
ipmi._console_pwfile_path(self.node.uuid)) ipmi._console_pwfile_path(self.node.uuid))
self.assertFalse(mock_exec_stop.call_count) self.assertFalse(mock_exec_stop.called)
@mock.patch.object(ipmi, '_exec_ipmitool', autospec=True) @mock.patch.object(ipmi, '_exec_ipmitool', autospec=True)
def test__exec_stop_console(self, mock_exec): def test__exec_stop_console(self, mock_exec):