diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-13 01:16:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-13 01:16:52 +0000 |
| commit | 5d6c42dde8968911700fb4f8d809046b7844b550 (patch) | |
| tree | 4cebf803369876ff9cc812a8a83c8428187d6ee7 | |
| parent | f3b23a3a9642fe3771d61b3acab419f2e38e0bc0 (diff) | |
| parent | 66de79a6f36255a2b9881d24cfd20eeaeef7eb04 (diff) | |
| download | python-keystoneclient-0.4.2.tar.gz | |
Merge "auth_token tests use assertIs/Not/None"0.4.2
| -rw-r--r-- | keystoneclient/tests/test_auth_token_middleware.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index 3eda485..d4f64e8 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -674,7 +674,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() @@ -721,11 +721,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'} @@ -878,7 +878,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): |