diff options
| author | Jamie Lennox <jamielennox@redhat.com> | 2014-07-16 14:14:54 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@redhat.com> | 2014-07-16 14:22:13 +1000 |
| commit | 0ed2eec57f14b7f50e472405d7a78130f124e5af (patch) | |
| tree | db2e2da34a8f392161393c34f39aa1ade5edea4d /keystoneclient/fixture | |
| parent | 3d3e0e485c630baf9bd9f93b29245a04084ae3d0 (diff) | |
| download | python-keystoneclient-0ed2eec57f14b7f50e472405d7a78130f124e5af.tar.gz | |
Fix mistakes in token fixtures
There are two small mistakes i discovered in the token fixtures. Fix
these and add a bunch of new tests that would have caught them earlier.
Closes-Bug: #1342513
Closes-Bug: #1342515
Change-Id: I7c07bd915fd84cc77cae0004220d8bb8d79bb082
Diffstat (limited to 'keystoneclient/fixture')
| -rw-r--r-- | keystoneclient/fixture/v2.py | 2 | ||||
| -rw-r--r-- | keystoneclient/fixture/v3.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystoneclient/fixture/v2.py b/keystoneclient/fixture/v2.py index f6e827c..467ad4c 100644 --- a/keystoneclient/fixture/v2.py +++ b/keystoneclient/fixture/v2.py @@ -165,7 +165,7 @@ class Token(dict): @property def trust_id(self): - return self.root.setdefault('trust', {})('id') + return self.root.setdefault('trust', {})['id'] @trust_id.setter def trust_id(self, value): diff --git a/keystoneclient/fixture/v3.py b/keystoneclient/fixture/v3.py index 87e0b7b..18286e3 100644 --- a/keystoneclient/fixture/v3.py +++ b/keystoneclient/fixture/v3.py @@ -218,7 +218,7 @@ class Token(dict): @property def project_domain_name(self): - return self.root.get('project', {}).get('project', {}).get('name') + return self.root.get('project', {}).get('domain', {}).get('name') @project_domain_name.setter def project_domain_name(self, value): |