diff options
author | Henry Nash <henryn@linux.vnet.ibm.com> | 2013-02-22 16:30:35 +0000 |
---|---|---|
committer | Henry Nash <henryn@linux.vnet.ibm.com> | 2013-02-22 18:42:25 +0000 |
commit | 1f7f1bd3c846da88269c0c05a4f20ed4a514e063 (patch) | |
tree | 96dff354cb714436a35d75df52649cec9730dc34 /tests/test_v3_protection.py | |
parent | 95815708ebc2cacc7d3b1da0602aebc791ac2258 (diff) | |
download | keystone-1f7f1bd3c846da88269c0c05a4f20ed4a514e063.tar.gz keystone-1f7f1bd3c846da88269c0c05a4f20ed4a514e063.tar.xz keystone-1f7f1bd3c846da88269c0c05a4f20ed4a514e063.zip |
Ensure keystone unittests do not leave CONF.policyfile in bad state
A few of the tests overwrite the name of the policy file (so they can
use a temp file instead). However, if it is left that way, subsequent
tests that rely on it may fail.
A separate patch will look at doing a more comprehensive reset in the
setup of test_v3 - ensuring we always start from a completely clean
slate for all confirguration parameters.
Fixes Bug #1131819
Change-Id: Ibe5ee12f44310de00b12ddd405c83f59b2d840b7
Diffstat (limited to 'tests/test_v3_protection.py')
-rw-r--r-- | tests/test_v3_protection.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py index b211af10..bda73415 100644 --- a/tests/test_v3_protection.py +++ b/tests/test_v3_protection.py @@ -20,11 +20,15 @@ import uuid import nose.exc +from keystone import config from keystone.policy.backends import rules import test_v3 +CONF = config.CONF + + class IdentityTestProtectedCase(test_v3.RestfulTestCase): """Test policy protection of a sample of v3 identity apis""" @@ -71,6 +75,7 @@ class IdentityTestProtectedCase(test_v3.RestfulTestCase): # Initialize the policy engine and allow us to write to a temp # file in each test to create the policies + self.orig_policy_file = CONF.policy_file rules.reset() _unused, self.tmpfilename = tempfile.mkstemp() self.opt(policy_file=self.tmpfilename) @@ -85,6 +90,11 @@ class IdentityTestProtectedCase(test_v3.RestfulTestCase): self.auth['authentication']['password']['user']['password'] = ( self.user1['password']) + def tearDown(self): + super(IdentityTestProtectedCase, self).tearDown() + rules.reset() + self.opt(policy_file=self.orig_policy_file) + def _get_id_list_from_ref_list(self, ref_list): result_list = [] for x in ref_list: |