From aef1eba5dff3bc44deac166b078751561f688996 Mon Sep 17 00:00:00 2001 From: licanwei Date: Tue, 19 Jul 2016 10:58:14 +0800 Subject: [PATCH] test_context_hook_before_method failed gate-watcher-python27 FAILURE The reason is that oslo_context.context.__init__() added parameter 'domain_name'. There are some mismatching in file '/watcher/common/context.py' Change-Id: If0be05943e7c89788d6ccba3385474ccb036e6f5 Closes-Bug: #1604214 --- watcher/common/context.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/watcher/common/context.py b/watcher/common/context.py index b11c99506..0c48a5ade 100644 --- a/watcher/common/context.py +++ b/watcher/common/context.py @@ -29,6 +29,14 @@ class RequestContext(context.RequestContext): without authentication. """ + super(RequestContext, self).__init__(auth_token=auth_token, + user=user, tenant=project, + is_admin=is_admin, + read_only=read_only, + show_deleted=show_deleted, + request_id=request_id, + roles=roles) + self.is_public_api = is_public_api self.user_id = user_id self.project = project @@ -39,14 +47,6 @@ class RequestContext(context.RequestContext): self.auth_token_info = auth_token_info self.trust_id = trust_id - super(RequestContext, self).__init__(auth_token=auth_token, - user=user, tenant=project, - is_admin=is_admin, - read_only=read_only, - show_deleted=show_deleted, - request_id=request_id, - roles=roles) - def to_dict(self): return {'auth_token': self.auth_token, 'auth_url': self.auth_url,