summaryrefslogtreecommitdiffstats
path: root/tests/test_v3_protection.py
diff options
context:
space:
mode:
authorGuang Yee <guang.yee@hp.com>2013-02-25 12:46:16 -0800
committerGuang Yee <guang.yee@hp.com>2013-02-26 09:22:09 -0800
commit250e6716bd91f9cc3412c92e5341557e59837e1e (patch)
tree45aaadc5f93c9852b8de78a782e074d02c4e9da1 /tests/test_v3_protection.py
parentf3d2a462209a9f2dd3faa1c5ca271f304eaa16d5 (diff)
downloadkeystone-250e6716bd91f9cc3412c92e5341557e59837e1e.tar.gz
keystone-250e6716bd91f9cc3412c92e5341557e59837e1e.tar.xz
keystone-250e6716bd91f9cc3412c92e5341557e59837e1e.zip
bug 1131840: fix auth and token data for XML translation
Change-Id: I4408b3e6e0752ca75bc36399f5148890820e9a89
Diffstat (limited to 'tests/test_v3_protection.py')
-rw-r--r--tests/test_v3_protection.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py
index 999dfa86..5b461693 100644
--- a/tests/test_v3_protection.py
+++ b/tests/test_v3_protection.py
@@ -83,13 +83,14 @@ class IdentityTestProtectedCase(test_v3.RestfulTestCase):
# A default auth request we can use - un-scoped user token
self.auth = {}
- self.auth['authentication'] = {'methods': []}
- self.auth['authentication']['methods'].append('password')
- self.auth['authentication']['password'] = {'user': {}}
- self.auth['authentication']['password']['user']['id'] = (
+ self.auth['identity'] = {'methods': []}
+ self.auth['identity']['methods'].append('password')
+ self.auth['identity']['password'] = {'user': {}}
+ self.auth['identity']['password']['user']['id'] = (
self.user1['id'])
- self.auth['authentication']['password']['user']['password'] = (
+ self.auth['identity']['password']['user']['password'] = (
self.user1['password'])
+ self.auth = {'auth': self.auth}
def tearDown(self):
super(IdentityTestProtectedCase, self).tearDown()
@@ -136,7 +137,7 @@ class IdentityTestProtectedCase(test_v3.RestfulTestCase):
new_policy = """{"identity:list_users": ["domain_id:%(domain_id)s"]}"""
with open(self.tmpfilename, "w") as policyfile:
policyfile.write(new_policy)
- self.auth['scope'] = {'domain': {'id': self.domainA['id']}}
+ self.auth['auth']['scope'] = {'domain': {'id': self.domainA['id']}}
url_by_name = '/users?domain_id=%s' % self.user1['domain_id']
r = self.get(url_by_name, auth=self.auth)
# We should only get back one user, the one in DomainA