openstack/zun
Code Issues Proposed changes

Merge "Remove usage of parameter enforce_type"

Browse Source
This commit is contained in:
Jenkins 2017-06-02 01:12:20 +00:00 committed by Gerrit Code Review
commit 2b270f133d
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zun/tests/base.py
View File

@ -36,7 +36,7 @@ try:
log.register_options(CONF)
except cfg.ArgsAlreadyParsedError:
pass
CONF.set_override('use_stderr', False, enforce_type=True)
CONF.set_override('use_stderr', False)
class BaseTestCase(testscenarios.WithScenarios, base.BaseTestCase):
@ -107,7 +107,7 @@ class TestCase(base.BaseTestCase):
"""Override config options 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 get_path(self, project_file=None):
"""Get the absolute path to a file. Used for testing the API.

6
zun/tests/unit/api/base.py
View File

@ -43,11 +43,9 @@ class FunctionalTest(base.DbTestCase):
# sqllite DB with sqlalchemy api.
cfg.CONF.set_override('db_type', 'sql')
zun.conf.CONF.set_override("auth_version", "v2.0",
group='keystone_authtoken',
enforce_type=True)
group='keystone_authtoken')
zun.conf.CONF.set_override("admin_user", "admin",
group='keystone_authtoken',
enforce_type=True)
group='keystone_authtoken')
# Determine where we are so we can set up paths in the config
root_dir = self.get_path()

3
zun/tests/unit/api/controllers/test_root.py
View File

@ -64,8 +64,7 @@ class TestRootController(api_base.FunctionalTest):
def make_app(self, paste_file):
file_name = self.get_path(paste_file)
cfg.CONF.set_override("api_paste_config", file_name, group="api",
enforce_type=True)
cfg.CONF.set_override("api_paste_config", file_name, group="api")
return webtest.TestApp(app.load_app())
def test_version(self):

24
zun/tests/unit/db/test_container.py
View File

@ -43,8 +43,7 @@ class DbContainerTestCase(base.DbTestCase):
def test_create_container_already_exists(self):
CONF.set_override("unique_container_name_scope", "",
group="compute",
enforce_type=True)
group="compute")
utils.create_test_container(context=self.context,
uuid='123')
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
@ -54,8 +53,7 @@ class DbContainerTestCase(base.DbTestCase):
def test_create_container_already_exists_in_project_name_space(self):
CONF.set_override("unique_container_name_scope", "project",
group="compute",
enforce_type=True)
group="compute")
utils.create_test_container(context=self.context, name='cont1')
with self.assertRaisesRegex(exception.ContainerAlreadyExists,
'A container with name.*'):
@ -68,8 +66,7 @@ class DbContainerTestCase(base.DbTestCase):
def test_create_container_already_exists_in_global_name_space(self):
CONF.set_override("unique_container_name_scope", "global",
group="compute",
enforce_type=True)
group="compute")
utils.create_test_container(context=self.context, name='cont1')
self.context.project_id = 'fake_project_1'
self.context.user_id = 'fake_user_1'
@ -84,8 +81,7 @@ class DbContainerTestCase(base.DbTestCase):
def test_create_container_already_exists_in_default_name_space(self):
CONF.set_override("unique_container_name_scope", "",
group="compute",
enforce_type=True)
group="compute")
utils.create_test_container(context=self.context,
name='cont1',
uuid=uuidutils.generate_uuid())
@ -249,8 +245,7 @@ class EtcdDbContainerTestCase(base.DbTestCase):
@mock.patch.object(etcd_client, 'write')
def test_create_container_already_exists(self, mock_write, mock_read):
CONF.set_override("unique_container_name_scope", "",
group="compute",
enforce_type=True)
group="compute")
mock_read.side_effect = etcd.EtcdKeyNotFound
utils.create_test_container(context=self.context)
mock_read.side_effect = lambda *args: None
@ -459,8 +454,7 @@ class EtcdDbContainerTestCase(base.DbTestCase):
mock_read.side_effect = etcd.EtcdKeyNotFound
mock_list_containers.return_value = []
CONF.set_override("unique_container_name_scope", "project",
group="compute",
enforce_type=True)
group="compute")
container1 = utils.create_test_container(
context=self.context, name='cont1')
mock_list_containers.return_value = [container1]
@ -478,8 +472,7 @@ class EtcdDbContainerTestCase(base.DbTestCase):
mock_read.side_effect = etcd.EtcdKeyNotFound
mock_list_containers.return_value = []
CONF.set_override("unique_container_name_scope", "global",
group="compute",
enforce_type=True)
group="compute")
container1 = utils.create_test_container(
context=self.context, name='cont1')
self.context.project_id = 'fake_project_1'
@ -499,8 +492,7 @@ class EtcdDbContainerTestCase(base.DbTestCase):
mock_read.side_effect = etcd.EtcdKeyNotFound
mock_list_containers.return_value = []
CONF.set_override("unique_container_name_scope", "",
group="compute",
enforce_type=True)
group="compute")
container1 = utils.create_test_container(
context=self.context, name='cont1',
uuid=uuidutils.generate_uuid())