openstack/python-keystoneclient
Code Issues Proposed changes

auth_token tests use assertIs/Not/None

Browse Source 
The tests in test_auth_token_middleware were using
assertEqual(res, None) and assertNotEqual(res, None) when they
should use assertIsNone and assertIsNotNone.

Change-Id: Ib1601b3a6101f843d9c29f3cd00aab339e671e61
This commit is contained in:
Brant Knudson
2014-01-12 12:51:14 -06:00
parent 765e43bb51
commit 66de79a6f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -673,7 +673,7 @@ class CommonAuthTokenMiddlewareTest(object):
token = self.token_dict['signed_token_scoped'] token = self.token_dict['signed_token_scoped']
req.headers['X-Auth-Token'] = token req.headers['X-Auth-Token'] = token
self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertNotEqual(self._get_cached_token(token), None) self.assertIsNotNone(self._get_cached_token(token))
def test_expired(self): def test_expired(self):
httpretty.disable() httpretty.disable()
@@ -720,11 +720,11 @@ class CommonAuthTokenMiddlewareTest(object):
with mock.patch(timeutils_utcnow) as mock_utcnow: with mock.patch(timeutils_utcnow) as mock_utcnow:
mock_utcnow.return_value = now mock_utcnow.return_value = now
self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertNotEqual(self._get_cached_token(token), None) self.assertIsNotNone(self._get_cached_token(token))
expired = now + datetime.timedelta(seconds=token_cache_time) expired = now + datetime.timedelta(seconds=token_cache_time)
with mock.patch(timeutils_utcnow) as mock_utcnow: with mock.patch(timeutils_utcnow) as mock_utcnow:
mock_utcnow.return_value = expired mock_utcnow.return_value = expired
self.assertEqual(self._get_cached_token(token), None) self.assertIsNone(self._get_cached_token(token))
def test_old_swift_memcache_set_expired(self): def test_old_swift_memcache_set_expired(self):
extra_conf = {'cache': 'swift.cache'} extra_conf = {'cache': 'swift.cache'}
@@ -877,7 +877,7 @@ class CommonAuthTokenMiddlewareTest(object):
req.headers['X-Auth-Token'] = ERROR_TOKEN req.headers['X-Auth-Token'] = ERROR_TOKEN
self.middleware.http_request_max_retries = 0 self.middleware.http_request_max_retries = 0
self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self._get_cached_token(ERROR_TOKEN), None) self.assertIsNone(self._get_cached_token(ERROR_TOKEN))
self.assert_valid_last_url(ERROR_TOKEN) self.assert_valid_last_url(ERROR_TOKEN)
def test_http_request_max_retries(self): def test_http_request_max_retries(self):