Merge "Enable hacking H101 test"

This commit is contained in:
Jenkins 2013-06-25 08:20:01 +00:00 committed by Gerrit Code Review
commit d511d64edc
5 changed files with 9 additions and 8 deletions

View File

@ -58,8 +58,9 @@ class APIVersionManager(object):
return self.supported[self._active]
key = getattr(settings, self.SETTINGS_KEY, {}).get(self.service_type)
if key is None:
# TODO: support API version discovery here; we'll leave the setting
# in as a way of overriding the latest available version.
# TODO(gabriel): support API version discovery here; we'll leave
# the setting in as a way of overriding the latest available
# version.
key = self.preferred
self._active = key
return self.supported[self._active]

View File

@ -109,7 +109,7 @@ def _get_endpoint_url(request, endpoint_type, catalog=None):
auth_url = getattr(settings, 'OPENSTACK_KEYSTONE_URL')
url = request.session.get('region_endpoint', auth_url)
# TODO: When the Service Catalog no longer contains API versions
# TODO(gabriel): When the Service Catalog no longer contains API versions
# in the endpoints this can be removed.
bits = urlparse.urlparse(url)
root = "://".join((bits.scheme, bits.netloc))

View File

@ -38,7 +38,8 @@ class CreateGroupForm(forms.SelfHandlingForm):
def handle(self, request, data):
try:
LOG.info('Creating group with name "%s"' % data['name'])
# TODO: Set the domain_id with the value from the Domain scope.
# TODO(lin-hua-cheng): Set the domain_id with the value from the
# Domain scope.
new_group = api.keystone.group_create(
request,
domain_id=None,

View File

@ -135,7 +135,7 @@ class RemoveMembers(tables.DeleteAction):
api.keystone.remove_group_user(request,
group_id=group_id,
user_id=user_obj.id)
# TODO: Fix the bug when removing current user
# TODO(lin-hua-cheng): Fix the bug when removing current user
# Keystone revokes the token of the user removed from the group.
# If the logon user was removed, redirect the user to logout.
@ -192,7 +192,7 @@ class AddMembers(tables.BatchAction):
api.keystone.add_group_user(request,
group_id=group_id,
user_id=user_obj.id)
# TODO: Fix the bug when adding current user
# TODO(lin-hua-cheng): Fix the bug when adding current user
# Keystone revokes the token of the user added to the group.
# If the logon user was added, redirect the user to logout.

View File

@ -42,7 +42,6 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
# F821 undefined name '<smth>'
# F841 local variable '<smth>' is assigned to but never used
# F999 syntax error in doctest
# H101 Use TODO(NAME)
# H201 no 'except:' at least use 'except Exception:'
# H302 import only modules.'from optparse import make_option' does not import a module
# H303 No wildcard (*) import.
@ -51,4 +50,4 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
# H4xx docstrings
# H701 empty localization string
# H702 Formatting operation should be outside of localization method call
ignore = E121,E126,E127,E128,F403,F811,F821,F841,F999,H101,H201,H302,H303,H304,H306,H4,H701,H702
ignore = E121,E126,E127,E128,F403,F811,F821,F841,F999,H201,H302,H303,H304,H306,H4,H701,H702