From 66de79a6f36255a2b9881d24cfd20eeaeef7eb04 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Sun, 12 Jan 2014 12:51:14 -0600 Subject: [PATCH] auth_token tests use assertIs/Not/None 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 --- keystoneclient/tests/test_auth_token_middleware.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index f5815fe62..46025d8ea 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -673,7 +673,7 @@ class CommonAuthTokenMiddlewareTest(object): token = self.token_dict['signed_token_scoped'] req.headers['X-Auth-Token'] = token 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): httpretty.disable() @@ -720,11 +720,11 @@ class CommonAuthTokenMiddlewareTest(object): with mock.patch(timeutils_utcnow) as mock_utcnow: mock_utcnow.return_value = now 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) with mock.patch(timeutils_utcnow) as mock_utcnow: 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): extra_conf = {'cache': 'swift.cache'} @@ -877,7 +877,7 @@ class CommonAuthTokenMiddlewareTest(object): req.headers['X-Auth-Token'] = ERROR_TOKEN self.middleware.http_request_max_retries = 0 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) def test_http_request_max_retries(self):