From 95956588c736174213c4abc5bf0968332cde2e83 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 20 Jan 2017 11:50:55 +0000 Subject: Mock out get_wildcard_address In cases where unit tests are running in a env where IPv6 isn't enabled it was returning the IPv4 wildcard address. Change-Id: I0ebadafca70d9cddf761f2ef54726e0123af10f5 --- .../tests/unit/extensions/test_iscsi.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'ironic_python_agent') diff --git a/ironic_python_agent/tests/unit/extensions/test_iscsi.py b/ironic_python_agent/tests/unit/extensions/test_iscsi.py index 6867b63a..7611c2b1 100644 --- a/ironic_python_agent/tests/unit/extensions/test_iscsi.py +++ b/ironic_python_agent/tests/unit/extensions/test_iscsi.py @@ -150,8 +150,11 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase): self.fake_dev = '/dev/fake' self.fake_iqn = 'iqn-fake' - def test_start_iscsi_target(self, mock_rtslib, mock_dispatch, + @mock.patch('ironic_python_agent.netutils.get_wildcard_address') + def test_start_iscsi_target(self, mock_get_wildcard_address, + mock_rtslib, mock_dispatch, mock_destroy): + mock_get_wildcard_address.return_value = '::' mock_dispatch.return_value = self.fake_dev result = self.agent_extension.start_iscsi_target(iqn=self.fake_iqn) @@ -195,9 +198,12 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase): mock_rtslib.TPG.return_value, '0.0.0.0', 3260) self.assertFalse(mock_destroy.called) - def test_start_iscsi_target_with_special_port(self, mock_rtslib, - mock_dispatch, + @mock.patch('ironic_python_agent.netutils.get_wildcard_address') + def test_start_iscsi_target_with_special_port(self, + mock_get_wildcard_address, + mock_rtslib, mock_dispatch, mock_destroy): + mock_get_wildcard_address.return_value = '::' mock_dispatch.return_value = self.fake_dev result = self.agent_extension.start_iscsi_target(iqn=self.fake_iqn, portal_port=3266) @@ -225,8 +231,10 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase): errors.ISCSIError, 'Failed to create a target', self.agent_extension.start_iscsi_target, iqn=self.fake_iqn) - def test_failed_to_bind_iscsi(self, mock_rtslib, mock_dispatch, - mock_destroy): + @mock.patch('ironic_python_agent.netutils.get_wildcard_address') + def test_failed_to_bind_iscsi(self, mock_get_wildcard_address, + mock_rtslib, mock_dispatch, mock_destroy): + mock_get_wildcard_address.return_value = '::' mock_dispatch.return_value = self.fake_dev mock_rtslib.NetworkPortal.side_effect = _ORIG_UTILS.RTSLibError() self.assertRaisesRegex( -- cgit v1.2.1