openstack/ironic-python-agent
Code Issues Proposed changes

tgtd session detach test fails on Centos7

Browse Source 
test_iscsi.TestISCSIExtensionCleanUpFallback.test_lio_not_available
seems to fail on Centos7. This is an attempt to fix it.

Change-Id: I11bb5ea69476769cebd0f91f696d5b80ab4fd8cb
This commit is contained in:
Arne Wiebalck 2019-10-04 13:56:21 +02:00
parent e9bcc81536
commit dd721dd22e
1 changed files with 5 additions and 5 deletions

10
ironic_python_agent/tests/unit/extensions/test_iscsi.py

@ -281,6 +281,7 @@ class TestISCSIExtensionLIO(base.IronicAgentTest):
mock_destroy.assert_called_once_with('/dev/fake', 'my_node_uuid')
@mock.patch.object(iscsi.rtslib_fb, 'RTSRoot', autospec=True)
@mock.patch.object(utils, 'execute', autospec=True)
class TestISCSIExtensionCleanUpFallback(base.IronicAgentTest):
@ -289,12 +290,10 @@ class TestISCSIExtensionCleanUpFallback(base.IronicAgentTest):
self.agent_extension = iscsi.ISCSIExtension()
self.fake_dev = '/dev/fake'
self.fake_iqn = 'iqn-fake'
self.rtsmock = mock.patch.object(
iscsi.rtslib_fb, 'RTSRoot',
side_effect=EnvironmentError(), autospec=True)
def test_lio_not_available(self, mock_execute):
def test_lio_not_available(self, mock_execute, mock_rtslib):
mock_execute.return_value = ('', '')
mock_rtslib.side_effect = EnvironmentError()
expected = [mock.call('tgtadm', '--lld', 'iscsi', '--mode',
'target', '--op', 'unbind', '--tid', '1',
'--initiator-address', 'ALL'),
@ -304,10 +303,11 @@ class TestISCSIExtensionCleanUpFallback(base.IronicAgentTest):
iscsi.clean_up(self.fake_dev)
mock_execute.assert_has_calls(expected)
def test_commands_fail(self, mock_execute):
def test_commands_fail(self, mock_execute, mock_rtslib):
mock_execute.side_effect = [processutils.ProcessExecutionError(),
('', ''),
processutils.ProcessExecutionError()]
mock_rtslib.side_effect = EnvironmentError()
expected = [mock.call('tgtadm', '--lld', 'iscsi', '--mode',
'target', '--op', 'unbind', '--tid', '1',
'--initiator-address', 'ALL'),