openstack/oslo.policy
Code Issues Proposed changes

Stop shouting test attribute names

Browse Source 
Change the instance attribute name CONF to conf because it's not a
global.

Change-Id: Ibfe19e0159b40952dbe28fb47b6940a13000dffc
This commit is contained in:
Doug Hellmann 2015-02-05 13:17:12 -05:00 committed by Steve Martinelli
parent 3eb921578a
commit 1adfc5f315
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oslo_policy/tests/base.py
View File

@ -14,8 +14,6 @@
# under the License.
import os.path
from oslo_config import cfg
from oslo_config import fixture as config
from oslotest import base as test_base
@ -29,9 +27,9 @@ class PolicyBaseTestCase(test_base.BaseTestCase):
def setUp(self):
super(PolicyBaseTestCase, self).setUp()
self.CONF = self.useFixture(config.Config()).conf
self.CONF(args=['--config-dir', TEST_VAR_DIR])
self.enforcer = policy.Enforcer(cfg.CONF)
self.conf = self.useFixture(config.Config()).conf
self.conf(args=['--config-dir', TEST_VAR_DIR])
self.enforcer = policy.Enforcer(self.conf)
self.addCleanup(self.enforcer.clear)

11
oslo_policy/tests/test_policy.py
View File

@ -107,7 +107,7 @@ class RulesTestCase(test_base.BaseTestCase):
class EnforcerTest(base.PolicyBaseTestCase):
def test_load_file(self):
self.CONF.set_override('policy_dirs', [], group='oslo_policy')
self.conf.set_override('policy_dirs', [], group='oslo_policy')
self.enforcer.load_rules(True)
self.assertIsNotNone(self.enforcer.rules)
self.assertIn('default', self.enforcer.rules)
@ -121,7 +121,7 @@ class EnforcerTest(base.PolicyBaseTestCase):
self.assertEqual('is_admin:True', loaded_rules['admin'])
def test_load_multiple_directories(self):
self.CONF.set_override('policy_dirs',
self.conf.set_override('policy_dirs',
['policy.d', 'policy.2.d'],
group='oslo_policy')
self.enforcer.load_rules(True)
@ -131,7 +131,7 @@ class EnforcerTest(base.PolicyBaseTestCase):
self.assertEqual('is_admin:True', loaded_rules['admin'])
def test_load_non_existed_directory(self):
self.CONF.set_override('policy_dirs',
self.conf.set_override('policy_dirs',
['policy.d', 'policy.x.d'],
group='oslo_policy')
self.enforcer.load_rules(True)
@ -315,7 +315,7 @@ class EnforcerTest(base.PolicyBaseTestCase):
def test_enforcer_default_rule_name(self):
enforcer = policy.Enforcer(cfg.CONF, default_rule='foo_rule')
self.assertEqual('foo_rule', enforcer.rules.default_rule)
self.CONF.set_override('policy_default_rule', 'bar_rule',
self.conf.set_override('policy_default_rule', 'bar_rule',
group='oslo_policy')
enforcer = policy.Enforcer(cfg.CONF, default_rule='foo_rule')
self.assertEqual('foo_rule', enforcer.rules.default_rule)
@ -331,9 +331,8 @@ class CheckFunctionTestCase(base.PolicyBaseTestCase):
self.assertEqual(result, ("target", "creds", self.enforcer))
def test_check_no_rules(self):
self.CONF.set_override('policy_file', 'empty.json',
self.conf.set_override('policy_file', 'empty.json',
group='oslo_policy')
self.enforcer.conf = self.CONF
self.enforcer.default_rule = None
self.enforcer.load_rules()
result = self.enforcer.enforce('rule', "target", "creds")