Revision 2182231b
| b/kamaki/clients/astakos.py | ||
|---|---|---|
| 57 | 57 |
|
| 58 | 58 |
def list(self): |
| 59 | 59 |
"""list cached user information""" |
| 60 |
return self._cache.values() |
|
| 60 |
r = [] |
|
| 61 |
for k, v in self._cache.items(): |
|
| 62 |
r.append(dict(v)) |
|
| 63 |
r[-1].update(dict(auth_token=k)) |
|
| 64 |
return r |
|
| 61 | 65 |
|
| 62 |
def _user_info(self, token=None): |
|
| 66 |
def info(self, token=None): |
|
| 67 |
"""Get (cached) user information""" |
|
| 63 | 68 |
token_bu = self.token |
| 64 | 69 |
token = token or self.token |
| 65 | 70 |
try: |
| ... | ... | |
| 71 | 76 |
|
| 72 | 77 |
def term(self, key, token=None): |
| 73 | 78 |
"""Get (cached) term, from user credentials""" |
| 74 |
return self._user_info(token)[key] |
|
| 79 |
return self.info(token)[key] |
|
| b/kamaki/clients/tests/astakos.py | ||
|---|---|---|
| 56 | 56 |
'email'): |
| 57 | 57 |
self.assertTrue(term in r) |
| 58 | 58 |
|
| 59 |
def test_info(self): |
|
| 60 |
self._test_0020_info() |
|
| 61 |
|
|
| 62 |
def _test_0020_info(self): |
|
| 63 |
self.assertTrue(set([ |
|
| 64 |
'name', |
|
| 65 |
'username', |
|
| 66 |
'uuid']).issubset(self.client.info().keys())) |
|
| 67 |
|
|
| 59 | 68 |
def test_get(self): |
| 60 | 69 |
self._test_0020_get() |
| 61 | 70 |
|
| ... | ... | |
| 64 | 73 |
'uuid', |
| 65 | 74 |
'name', |
| 66 | 75 |
'username'): |
| 67 |
self.assertEqual(self.client.term(term), self['astakos', term]) |
|
| 76 |
self.assertEqual( |
|
| 77 |
self.client.term(term, self['astakos', 'token']), |
|
| 78 |
self['astakos', term]) |
|
| 68 | 79 |
self.assertTrue(self['astakos', 'email'] in self.client.term('email'))
|
| 69 | 80 |
|
| 70 | 81 |
def test_list(self): |
| ... | ... | |
| 72 | 83 |
self._test_0020_list() |
| 73 | 84 |
|
| 74 | 85 |
def _test_0020_list(self): |
| 75 |
terms = set(['name', 'username', 'uuid', 'email']) |
|
| 86 |
terms = set(['name', 'username', 'uuid', 'email', 'auth_token'])
|
|
| 76 | 87 |
uuid = 0 |
| 77 | 88 |
for r in self.client.list(): |
| 78 | 89 |
self.assertTrue(terms.issubset(r.keys())) |
Also available in: Unified diff