summaryrefslogtreecommitdiff
path: root/keystoneclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-26 20:18:20 +0000
committerGerrit Code Review <review@openstack.org>2014-03-26 20:18:20 +0000
commit6a6c8d760b12d8f74721ce59c03987ab65ec613a (patch)
treece184dd81068414dc74ce7a6975a16511d9fa0ca /keystoneclient
parent2e092ffef779056ea1ffd6a1feb6987911a5b27f (diff)
parent162c6e2fa1387b5fe03c69ff9bbb831041643d59 (diff)
downloadpython-keystoneclient-0.7.1.tar.gz
Merge "Add 'methods' to all v3 test tokens"0.7.1
Diffstat (limited to 'keystoneclient')
-rw-r--r--keystoneclient/tests/client_fixtures.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py
index 6960355..1743162 100644
--- a/keystoneclient/tests/client_fixtures.py
+++ b/keystoneclient/tests/client_fixtures.py
@@ -265,6 +265,7 @@ class Examples(fixtures.Fixture):
self.v3_UUID_TOKEN_DEFAULT: {
'token': {
'expires_at': '2020-01-01T00:00:10.000123Z',
+ 'methods': ['password'],
'user': {
'id': 'user_id1',
'name': 'user_name1',
@@ -291,6 +292,7 @@ class Examples(fixtures.Fixture):
self.v3_UUID_TOKEN_UNSCOPED: {
'token': {
'expires_at': '2020-01-01T00:00:10.000123Z',
+ 'methods': ['password'],
'user': {
'id': 'user_id1',
'name': 'user_name1',
@@ -304,6 +306,7 @@ class Examples(fixtures.Fixture):
self.v3_UUID_TOKEN_DOMAIN_SCOPED: {
'token': {
'expires_at': '2020-01-01T00:00:10.000123Z',
+ 'methods': ['password'],
'user': {
'id': 'user_id1',
'name': 'user_name1',
@@ -358,6 +361,7 @@ class Examples(fixtures.Fixture):
self.SIGNED_v3_TOKEN_SCOPED_KEY: {
'token': {
'expires': '2020-01-01T00:00:10.000123Z',
+ 'methods': ['password'],
'user': {
'id': 'user_id1',
'name': 'user_name1',
@@ -384,6 +388,7 @@ class Examples(fixtures.Fixture):
self.v3_UUID_TOKEN_BIND: {
'token': {
'bind': {'kerberos': self.KERBEROS_BIND},
+ 'methods': ['password'],
'expires_at': '2020-01-01T00:00:10.000123Z',
'user': {
'id': 'user_id1',
@@ -412,6 +417,7 @@ class Examples(fixtures.Fixture):
'token': {
'bind': {'FOO': 'BAR'},
'expires_at': '2020-01-01T00:00:10.000123Z',
+ 'methods': ['password'],
'user': {
'id': 'user_id1',
'name': 'user_name1',