summaryrefslogtreecommitdiff
path: root/tests/unit/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-10 19:39:53 +0000
committerGerrit Code Review <review@openstack.org>2016-02-10 19:39:53 +0000
commit84d110c63ecf671377d4b2338060e9b00da44a4f (patch)
treeba6a9ec1770977f63e43cb0959d23527ae2e421a /tests/unit/utils.py
parentd2ee01bfe4bc8ac864d8f10ef657e6ce45168d9c (diff)
parenta175689418208e1c72d8db03d6b59893c73b2445 (diff)
downloadpython-swiftclient-84d110c63ecf671377d4b2338060e9b00da44a4f.tar.gz
Merge "Accept token and tenant_id for authenticating against KS"
Diffstat (limited to 'tests/unit/utils.py')
-rw-r--r--tests/unit/utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
index 17e07ac..f8f5e90 100644
--- a/tests/unit/utils.py
+++ b/tests/unit/utils.py
@@ -499,8 +499,8 @@ class FakeKeystone(object):
self.token = token
class _Client(object):
- def __init__(self, endpoint, token, **kwargs):
- self.auth_token = token
+ def __init__(self, endpoint, auth_token, **kwargs):
+ self.auth_token = auth_token
self.endpoint = endpoint
self.service_catalog = self.ServiceCatalog(endpoint)
@@ -515,8 +515,8 @@ class FakeKeystone(object):
def Client(self, **kwargs):
self.calls.append(kwargs)
- self.client = self._Client(endpoint=self.endpoint, token=self.token,
- **kwargs)
+ self.client = self._Client(
+ endpoint=self.endpoint, auth_token=self.token, **kwargs)
return self.client
class Unauthorized(Exception):