openstack/ironic-python-agent
Code Issues Proposed changes

Replace assertRaisesRegexp with assertRaisesRegex

Browse Source 
This patch replace assertRaisesRegexp with
assertRaisesRegex which is deprecated in python3
https://docs.python.org/3.2/library/unittest.html
Also it update the base tests to be oslotest
BaseTestCase for python2.7 and python3 compatibility

Change-Id: I02571946f0643247e208d98dc91ea78cd9d351ee
This commit is contained in:
Moshe Levi
2016-06-21 19:56:11 +03:00
parent d63820af12
commit 1ef8c32de0
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ironic_python_agent/tests/unit/extensions/test_iscsi.py
View File

@@ -199,7 +199,7 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase):
mock_destroy): mock_destroy):
mock_dispatch.return_value = self.fake_dev mock_dispatch.return_value = self.fake_dev
mock_rtslib.Target.side_effect = _ORIG_UTILS.RTSLibError() mock_rtslib.Target.side_effect = _ORIG_UTILS.RTSLibError()
self.assertRaisesRegexp( self.assertRaisesRegex(
errors.ISCSIError, 'Failed to create a target', errors.ISCSIError, 'Failed to create a target',
self.agent_extension.start_iscsi_target, iqn=self.fake_iqn) self.agent_extension.start_iscsi_target, iqn=self.fake_iqn)
@@ -207,7 +207,7 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase):
mock_destroy): mock_destroy):
mock_dispatch.return_value = self.fake_dev mock_dispatch.return_value = self.fake_dev
mock_rtslib.NetworkPortal.side_effect = _ORIG_UTILS.RTSLibError() mock_rtslib.NetworkPortal.side_effect = _ORIG_UTILS.RTSLibError()
self.assertRaisesRegexp( self.assertRaisesRegex(
errors.ISCSIError, 'Failed to publish a target', errors.ISCSIError, 'Failed to publish a target',
self.agent_extension.start_iscsi_target, iqn=self.fake_iqn, self.agent_extension.start_iscsi_target, iqn=self.fake_iqn,
portal_port=None) portal_port=None)
@@ -231,7 +231,7 @@ class TestISCSIExtensionLIO(test_base.BaseTestCase):
mock_destroy): mock_destroy):
mock_dispatch.return_value = self.fake_dev mock_dispatch.return_value = self.fake_dev
mock_rtslib.Target.side_effect = _ORIG_UTILS.RTSLibError() mock_rtslib.Target.side_effect = _ORIG_UTILS.RTSLibError()
self.assertRaisesRegexp( self.assertRaisesRegex(
errors.ISCSIError, 'Failed to create a target', errors.ISCSIError, 'Failed to create a target',
self.agent_extension.start_iscsi_target, self.agent_extension.start_iscsi_target,
iqn=self.fake_iqn, iqn=self.fake_iqn,

2
ironic_python_agent/tests/unit/test_hardware.py
View File

@@ -1238,7 +1238,7 @@ class TestModuleFunctions(test_base.BaseTestCase):
mocked_execute): mocked_execute):
"""Test for missing values returned from lsblk""" """Test for missing values returned from lsblk"""
mocked_execute.return_value = ('TYPE="disk" MODEL="model"', '') mocked_execute.return_value = ('TYPE="disk" MODEL="model"', '')
self.assertRaisesRegexp( self.assertRaisesRegex(
errors.BlockDeviceError, errors.BlockDeviceError,
r'^Block device caused unknown error: KNAME, ROTA, SIZE must be ' r'^Block device caused unknown error: KNAME, ROTA, SIZE must be '
r'returned by lsblk.$', r'returned by lsblk.$',

26
ironic_python_agent/tests/unit/test_inspector.py
View File

@@ -19,11 +19,11 @@ import copy
import io import io
import tarfile import tarfile
import time import time
import unittest
import mock import mock
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslotest import base as test_base
import requests import requests
import six import six
import stevedore import stevedore
@@ -49,14 +49,14 @@ class AcceptingFailure(mock.Mock):
failure, expect_error) failure, expect_error)
class TestMisc(unittest.TestCase): class TestMisc(test_base.BaseTestCase):
def test_default_collector_loadable(self): def test_default_collector_loadable(self):
ext = inspector.extension_manager([inspector.DEFAULT_COLLECTOR]) ext = inspector.extension_manager([inspector.DEFAULT_COLLECTOR])
self.assertIs(ext[inspector.DEFAULT_COLLECTOR].plugin, self.assertIs(ext[inspector.DEFAULT_COLLECTOR].plugin,
inspector.collect_default) inspector.collect_default)
def test_raise_on_wrong_collector(self): def test_raise_on_wrong_collector(self):
self.assertRaisesRegexp(errors.InspectionError, self.assertRaisesRegex(errors.InspectionError,
'foobar', 'foobar',
inspector.extension_manager, inspector.extension_manager,
['foobar']) ['foobar'])
@@ -65,7 +65,7 @@ class TestMisc(unittest.TestCase):
@mock.patch.object(inspector, 'setup_ipmi_credentials', autospec=True) @mock.patch.object(inspector, 'setup_ipmi_credentials', autospec=True)
@mock.patch.object(inspector, 'call_inspector', new_callable=AcceptingFailure) @mock.patch.object(inspector, 'call_inspector', new_callable=AcceptingFailure)
@mock.patch.object(stevedore, 'NamedExtensionManager', autospec=True) @mock.patch.object(stevedore, 'NamedExtensionManager', autospec=True)
class TestInspect(unittest.TestCase): class TestInspect(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestInspect, self).setUp() super(TestInspect, self).setUp()
CONF.set_override('inspection_callback_url', 'http://foo/bar', CONF.set_override('inspection_callback_url', 'http://foo/bar',
@@ -104,7 +104,7 @@ class TestInspect(unittest.TestCase):
mock_ext_mgr.return_value = [self.mock_ext] mock_ext_mgr.return_value = [self.mock_ext]
self.mock_collect.side_effect = RuntimeError('boom') self.mock_collect.side_effect = RuntimeError('boom')
self.assertRaisesRegexp(errors.InspectionError, self.assertRaisesRegex(errors.InspectionError,
'boom', inspector.inspect) 'boom', inspector.inspect)
self.mock_collect.assert_called_with_failure() self.mock_collect.assert_called_with_failure()
@@ -116,7 +116,7 @@ class TestInspect(unittest.TestCase):
enforce_type=True) enforce_type=True)
mock_ext_mgr.side_effect = RuntimeError('boom') mock_ext_mgr.side_effect = RuntimeError('boom')
self.assertRaisesRegexp(RuntimeError, 'boom', inspector.inspect) self.assertRaisesRegex(RuntimeError, 'boom', inspector.inspect)
mock_call.assert_called_with_failure(expect_error=True) mock_call.assert_called_with_failure(expect_error=True)
self.assertFalse(mock_setup_ipmi.called) self.assertFalse(mock_setup_ipmi.called)
@@ -134,7 +134,7 @@ class TestInspect(unittest.TestCase):
@mock.patch.object(requests, 'post', autospec=True) @mock.patch.object(requests, 'post', autospec=True)
class TestCallInspector(unittest.TestCase): class TestCallInspector(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestCallInspector, self).setUp() super(TestCallInspector, self).setUp()
CONF.set_override('inspection_callback_url', 'url', CONF.set_override('inspection_callback_url', 'url',
@@ -176,7 +176,7 @@ class TestCallInspector(unittest.TestCase):
@mock.patch.object(utils, 'execute', autospec=True) @mock.patch.object(utils, 'execute', autospec=True)
class TestSetupIpmiCredentials(unittest.TestCase): class TestSetupIpmiCredentials(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestSetupIpmiCredentials, self).setUp() super(TestSetupIpmiCredentials, self).setUp()
self.resp = {'ipmi_username': 'user', self.resp = {'ipmi_username': 'user',
@@ -227,7 +227,7 @@ class TestSetupIpmiCredentials(unittest.TestCase):
self.assertEqual(expected, mock_call.call_args_list) self.assertEqual(expected, mock_call.call_args_list)
class BaseDiscoverTest(unittest.TestCase): class BaseDiscoverTest(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(BaseDiscoverTest, self).setUp() super(BaseDiscoverTest, self).setUp()
self.inventory = { self.inventory = {
@@ -379,7 +379,7 @@ class TestCollectDefault(BaseDiscoverTest):
@mock.patch.object(utils, 'execute', autospec=True) @mock.patch.object(utils, 'execute', autospec=True)
class TestCollectLogs(unittest.TestCase): class TestCollectLogs(test_base.BaseTestCase):
def test(self, mock_execute): def test(self, mock_execute):
contents = 'journal contents \xd0\xbc\xd1\x8f\xd1\x83' contents = 'journal contents \xd0\xbc\xd1\x8f\xd1\x83'
# That's how execute() works with binary=True # That's how execute() works with binary=True
@@ -416,7 +416,7 @@ class TestCollectLogs(unittest.TestCase):
@mock.patch.object(utils, 'execute', autospec=True) @mock.patch.object(utils, 'execute', autospec=True)
class TestCollectExtraHardware(unittest.TestCase): class TestCollectExtraHardware(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestCollectExtraHardware, self).setUp() super(TestCollectExtraHardware, self).setUp()
self.data = {} self.data = {}
@@ -463,7 +463,7 @@ class TestCollectExtraHardware(unittest.TestCase):
@mock.patch.object(utils, 'get_agent_params', lambda: {'BOOTIF': '01-cdef'}) @mock.patch.object(utils, 'get_agent_params', lambda: {'BOOTIF': '01-cdef'})
@mock.patch.object(hardware, 'dispatch_to_managers', autospec=True) @mock.patch.object(hardware, 'dispatch_to_managers', autospec=True)
class TestWaitForDhcp(unittest.TestCase): class TestWaitForDhcp(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestWaitForDhcp, self).setUp() super(TestWaitForDhcp, self).setUp()
CONF.set_override('inspection_dhcp_wait_timeout', CONF.set_override('inspection_dhcp_wait_timeout',
@@ -549,7 +549,7 @@ class TestWaitForDhcp(unittest.TestCase):
self.assertFalse(mocked_dispatch.called) self.assertFalse(mocked_dispatch.called)
class TestNormalizeMac(unittest.TestCase): class TestNormalizeMac(test_base.BaseTestCase):
def test_correct_mac(self): def test_correct_mac(self):
self.assertEqual('11:22:33:aa:bb:cc', self.assertEqual('11:22:33:aa:bb:cc',
inspector._normalize_mac('11:22:33:aa:BB:cc')) inspector._normalize_mac('11:22:33:aa:BB:cc'))

2
ironic_python_agent/tests/unit/test_utils.py
View File

@@ -425,4 +425,4 @@ class TestFailures(testtools.TestCase):
f = utils.AccumulatedFailures(exc_class=FakeException) f = utils.AccumulatedFailures(exc_class=FakeException)
self.assertIsNone(f.raise_if_needed()) self.assertIsNone(f.raise_if_needed())
f.add('foo') f.add('foo')
self.assertRaisesRegexp(FakeException, 'foo', f.raise_if_needed) self.assertRaisesRegex(FakeException, 'foo', f.raise_if_needed)