openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Tests stop using deprecated HTTPClient.get()"

Browse Source
This commit is contained in:
Jenkins
2016-02-29 18:33:50 +00:00
committed by Gerrit Code Review
parent 85c7a94703 c107a05b5e
commit d871cd96e0
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
keystoneclient/tests/unit/v2_0/test_auth.py
View File

@@ -243,8 +243,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
self.assertEqual(cl.auth_token, self.TEST_TOKEN) self.assertEqual(cl.auth_token, self.TEST_TOKEN)
# the token returned from the authentication will be used # the token returned from the authentication will be used
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')
@@ -253,8 +252,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
# then override that token and the new token shall be used # then override that token and the new token shall be used
cl.auth_token = fake_token cl.auth_token = fake_token
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')
@@ -263,8 +261,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
# if we clear that overridden token then we fall back to the original # if we clear that overridden token then we fall back to the original
del cl.auth_token del cl.auth_token
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')

12
keystoneclient/tests/unit/v3/test_auth.py
View File

@@ -241,8 +241,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
body = jsonutils.loads(self.requests_mock.last_request.body) body = jsonutils.loads(self.requests_mock.last_request.body)
self.assertEqual(body['auth']['identity']['token']['id'], fake_token) self.assertEqual(body['auth']['identity']['token']['id'], fake_token)
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')
@@ -348,8 +347,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
self.assertEqual(cl.auth_token, self.TEST_TOKEN) self.assertEqual(cl.auth_token, self.TEST_TOKEN)
# the token returned from the authentication will be used # the token returned from the authentication will be used
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')
@@ -358,8 +356,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
# then override that token and the new token shall be used # then override that token and the new token shall be used
cl.auth_token = fake_token cl.auth_token = fake_token
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')
@@ -368,8 +365,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
# if we clear that overridden token then we fall back to the original # if we clear that overridden token then we fall back to the original
del cl.auth_token del cl.auth_token
with self.deprecations.expect_deprecations_here(): resp, body = cl._adapter.get(fake_url)
resp, body = cl.get(fake_url)
self.assertEqual(fake_resp, body) self.assertEqual(fake_resp, body)
token = self.requests_mock.last_request.headers.get('X-Auth-Token') token = self.requests_mock.last_request.headers.get('X-Auth-Token')