openstack
/
nova
Code Issues Proposed changes

Remove usage of parameter enforce_type 

Oslo.config deprecated parameter enforce_type and change its
default value to True in Ifa552de0a994e40388cbc9f7dbaa55700ca276b0.
Nova peridic py35 job failure due to the DeprecationWarning: "Using the
'enforce_type' argument is deprecated in version '4.0' and will be
removed in version '5.0': The argument enforce_type has changed its
default value to True and then will be removed completely."[1]
So need clean up usage of enforce_type.

Note this patch also change enforce_type from False to default value
True in test__get_node_console_with_reset_wait_timeout. We should test
as runtime, we can use float type to test when config option
serial_console_state_timeout is float.

[1] http://logs.openstack.org/periodic/periodic-nova-py35-with-oslo-master/6eeea0f/testr_results.html.gz

Related--Bug: #1517839

Change-Id: I94915a5c6abbbb739c597025272dc0e25d3ba2ec
This commit is contained in:
ChangBo Guo(gcb) 2017-04-17 16:51:02 +08:00
parent ad14f4598e
commit 213f7120c4
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/test.py
View File

@ -348,7 +348,7 @@ class TestCase(testtools.TestCase):
"""Override flag variables for a test."""
group = kw.pop('group', None)
for k, v in kw.items():
CONF.set_override(k, v, group, enforce_type=True)
CONF.set_override(k, v, group)
def start_service(self, name, host=None, **kwargs):
if name == 'compute' and self.USES_DB:

6
nova/tests/unit/virt/ironic/test_driver.py
View File

@ -2297,11 +2297,7 @@ class IronicDriverConsoleTestCase(test.NoDBTestCase):
@mock.patch.object(ironic_driver, 'LOG', autospec=True)
def test__get_node_console_with_reset_wait_timeout(self, mock_log,
mock_node):
# Set timeout to a small value to reduce testing time
# Note: timeout value is integer, use enforce_type=False to set it
# to a floating number.
CONF.set_override('serial_console_state_timeout', 0.1,
group='ironic', enforce_type=False)
CONF.set_override('serial_console_state_timeout', 1, group='ironic')
temp_data = {'target_mode': True}
def _fake_get_console(node_uuid):

6
nova/tests/unit/virt/test_driver.py
View File

@ -26,8 +26,7 @@ class DriverMethodTestCase(test.NoDBTestCase):
self.CONF = self.useFixture(fixture_config.Config()).conf
def test_is_xenapi_true(self):
self.CONF.set_override('compute_driver', 'xenapi.XenAPIDriver',
enforce_type=True)
self.CONF.set_override('compute_driver', 'xenapi.XenAPIDriver')
self.assertTrue(driver.is_xenapi())
def test_is_xenapi_false(self):
@ -35,6 +34,5 @@ class DriverMethodTestCase(test.NoDBTestCase):
'ironic.IronicDriver', 'vmwareapi.VMwareVCDriver',
'hyperv.HyperVDriver', None)
for driver_name in driver_names:
self.CONF.set_override('compute_driver', driver_name,
enforce_type=True)
self.CONF.set_override('compute_driver', driver_name)
self.assertFalse(driver.is_xenapi())