openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Fix and enable gating on F841"

Browse Source
This commit is contained in:
Jenkins
2013-08-30 00:21:03 +00:00
committed by Gerrit Code Review
parent dfa9d83b81 f719e109dd
commit 0bf1607c73
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/middleware/auth_token.py
View File

@@ -789,11 +789,11 @@ class AuthProtocol(object):
expires = self._confirm_token_not_expired(data) expires = self._confirm_token_not_expired(data)
self._cache_put(token_id, data, expires) self._cache_put(token_id, data, expires)
return data return data
except NetworkError as e: except NetworkError:
self.LOG.debug('Token validation failure.', exc_info=True) self.LOG.debug('Token validation failure.', exc_info=True)
self.LOG.warn("Authorization failed for token %s", token_id) self.LOG.warn("Authorization failed for token %s", token_id)
raise InvalidUserToken('Token authorization failed') raise InvalidUserToken('Token authorization failed')
except Exception as e: except Exception:
self.LOG.debug('Token validation failure.', exc_info=True) self.LOG.debug('Token validation failure.', exc_info=True)
if token_id: if token_id:
self._cache_store_invalid(token_id) self._cache_store_invalid(token_id)

2
tests/test_auth_token_middleware.py
View File

@@ -1192,7 +1192,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
# lower, v2, api version # lower, v2, api version
req = webob.Request.blank('/') req = webob.Request.blank('/')
req.headers['X-Auth-Token'] = client_fixtures.UUID_TOKEN_DEFAULT req.headers['X-Auth-Token'] = client_fixtures.UUID_TOKEN_DEFAULT
body = self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertEqual("/testadmin/v2.0/tokens/%s" % self.assertEqual("/testadmin/v2.0/tokens/%s" %
client_fixtures.UUID_TOKEN_DEFAULT, client_fixtures.UUID_TOKEN_DEFAULT,

6
tests/test_http.py
View File

@@ -144,7 +144,7 @@ class ClientTest(utils.TestCase):
original_ip=ORIGINAL_IP) original_ip=ORIGINAL_IP)
with mock.patch.object(requests, "request", MOCK_REQUEST): with mock.patch.object(requests, "request", MOCK_REQUEST):
res = cl.request('/', 'GET') cl.request('/', 'GET')
args, kwargs = MOCK_REQUEST.call_args args, kwargs = MOCK_REQUEST.call_args
self.assertIn( self.assertIn(
@@ -198,7 +198,7 @@ class BasicRequestTests(testtools.TestCase):
response = 'Test Response' response = 'Test Response'
status = 200 status = 200
resp = self.request(method=method, status=status, response=response) self.request(method=method, status=status, response=response)
self.assertEqual(self.last_request.method, method) self.assertEqual(self.last_request.method, method)
@@ -224,6 +224,6 @@ class BasicRequestTests(testtools.TestCase):
def test_body(self): def test_body(self):
data = "BODY DATA" data = "BODY DATA"
resp = self.request(response=data) self.request(response=data)
self.assertThat(self.logger.debug_log, matchers.Contains('BODY:')) self.assertThat(self.logger.debug_log, matchers.Contains('BODY:'))
self.assertThat(self.logger.debug_log, matchers.Contains(data)) self.assertThat(self.logger.debug_log, matchers.Contains(data))

8
tests/v2_0/test_users.py
View File

@@ -277,12 +277,12 @@ class UserTests(utils.TestCase):
**kwargs).AndReturn((resp_4)) **kwargs).AndReturn((resp_4))
self.mox.ReplayAll() self.mox.ReplayAll()
user = self.client.users.update(2, self.client.users.update(2,
name='gabriel', name='gabriel',
email='gabriel@example.com') email='gabriel@example.com')
user = self.client.users.update_password(2, 'swordfish') self.client.users.update_password(2, 'swordfish')
user = self.client.users.update_tenant(2, 1) self.client.users.update_tenant(2, 1)
user = self.client.users.update_enabled(2, False) self.client.users.update_enabled(2, False)
def test_update_own_password(self): def test_update_own_password(self):
req_body = { req_body = {

3
tox.ini
View File

@@ -29,8 +29,7 @@ downloadcache = ~/cache/pip
[flake8] [flake8]
# F811: redefinition of unused 'client' from line 81 # F811: redefinition of unused 'client' from line 81
# F821: undefined name # F821: undefined name
# F841: local variable is assigned to but never used
# H304: no relative imports # H304: no relative imports
ignore = F811,F821,F841,H304 ignore = F811,F821,H304
show-source = True show-source = True
exclude = .venv,.tox,dist,doc,*egg,build exclude = .venv,.tox,dist,doc,*egg,build