Merge "Remove enforce_type=True from oslo.config set_override"
diff --git a/patrole_tempest_plugin/tests/unit/test_rbac_rule_validation.py b/patrole_tempest_plugin/tests/unit/test_rbac_rule_validation.py
index 41af3b2..4fcf5bb 100644
--- a/patrole_tempest_plugin/tests/unit/test_rbac_rule_validation.py
+++ b/patrole_tempest_plugin/tests/unit/test_rbac_rule_validation.py
@@ -37,8 +37,7 @@
self.mock_args.auth_provider.credentials.user_id = \
mock.sentinel.user_id
- CONF.set_override('rbac_test_role', 'Member', group='rbac',
- enforce_type=True)
+ CONF.set_override('rbac_test_role', 'Member', group='rbac')
self.addCleanup(CONF.clear_override, 'rbac_test_role', group='rbac')
@mock.patch.object(rbac_rv, 'LOG', autospec=True)
@@ -261,8 +260,7 @@
def test_invalid_policy_rule_throws_parsing_exception(
self, mock_rbac_policy_parser):
"""Test that invalid policy action causes test to be skipped."""
- CONF.set_override('strict_policy_check', True, group='rbac',
- enforce_type=True)
+ CONF.set_override('strict_policy_check', True, group='rbac')
self.addCleanup(CONF.clear_override, 'strict_policy_check',
group='rbac')
diff --git a/patrole_tempest_plugin/tests/unit/test_rbac_utils.py b/patrole_tempest_plugin/tests/unit/test_rbac_utils.py
index a2917cf..b7f6ba8 100644
--- a/patrole_tempest_plugin/tests/unit/test_rbac_utils.py
+++ b/patrole_tempest_plugin/tests/unit/test_rbac_utils.py
@@ -51,12 +51,9 @@
self.mock_test_obj.os_admin = mock.Mock(
**{'roles_v3_client.list_roles.return_value': available_roles})
- CONF.set_override('admin_role', 'admin', group='identity',
- enforce_type=True)
- CONF.set_override('auth_version', 'v3', group='identity',
- enforce_type=True)
- CONF.set_override('rbac_test_role', 'Member', group='rbac',
- enforce_type=True)
+ CONF.set_override('admin_role', 'admin', group='identity')
+ CONF.set_override('auth_version', 'v3', group='identity')
+ CONF.set_override('rbac_test_role', 'Member', group='rbac')
self.addCleanup(CONF.clear_override, 'rbac_test_role', group='rbac')
self.addCleanup(CONF.clear_override, 'admin_role', group='identity')