openstack/aodh
Code Issues Proposed changes

Fix testing gate due to new keystoneclient release

Browse Source 
As new keystoneclient version was released, token now
requires 'expires' field to be set.

Change-Id: I57a7746d24b82763824a02ac3d02049b055288c7
This commit is contained in:
Dina Belova 2014-05-30 15:13:33 +04:00
parent 4ed4559f47
commit 5a78832251
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/tests/api/v2/test_acl_scenarios.py
View File

@ -41,7 +41,8 @@ class FakeMemcache(object):
if key == "tokens/%s" % VALID_TOKEN: if key == "tokens/%s" % VALID_TOKEN:
dt = timeutils.utcnow() + datetime.timedelta(minutes=5) dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
return json.dumps(({'access': { return json.dumps(({'access': {
'token': {'id': VALID_TOKEN}, 'token': {'id': VALID_TOKEN,
'expires': timeutils.isotime(dt)},
'user': { 'user': {
'id': 'user_id1', 'id': 'user_id1',
'name': 'user_name1', 'name': 'user_name1',
@ -54,7 +55,8 @@ class FakeMemcache(object):
if key == "tokens/%s" % VALID_TOKEN2: if key == "tokens/%s" % VALID_TOKEN2:
dt = timeutils.utcnow() + datetime.timedelta(minutes=5) dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
return json.dumps(({'access': { return json.dumps(({'access': {
'token': {'id': VALID_TOKEN2}, 'token': {'id': VALID_TOKEN2,
'expires': timeutils.isotime(dt)},
'user': { 'user': {
'id': 'user_id2', 'id': 'user_id2',
'name': 'user-good', 'name': 'user-good',