From 66f59fb03143171490d2fa9782cac4d872289ad4 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 16 Mar 2015 14:58:28 +1100 Subject: [PATCH] Rename requests mock object in testing It has been mentioned a number of times that the self.requests naming for the requests_mock object is confusing between whether you are actually sending a request or are mocking a request. Rename all entries of the requests object to requests_mock. This cleans up a couple of entries where the older register_uri format was being used in favour of using the HTTP method as the requests_mock method. Change-Id: I315085b4088130b510f9dbd696011d983598372c --- .../tests/unit/auth/test_identity_common.py | 7 +- .../tests/unit/auth/test_identity_v2.py | 3 +- .../tests/unit/auth/test_identity_v3.py | 8 +- .../tests/unit/auth/test_token_endpoint.py | 2 +- keystoneclient/tests/unit/auth/utils.py | 4 +- keystoneclient/tests/unit/test_discovery.py | 111 +++++++++--------- keystoneclient/tests/unit/test_session.py | 64 +++++----- 7 files changed, 103 insertions(+), 96 deletions(-) diff --git a/keystoneclient/tests/unit/auth/test_identity_common.py b/keystoneclient/tests/unit/auth/test_identity_common.py index db30bea..3bf04c7 100644 --- a/keystoneclient/tests/unit/auth/test_identity_common.py +++ b/keystoneclient/tests/unit/auth/test_identity_common.py @@ -113,7 +113,7 @@ class CommonIdentityTests(object): # register responses such that if the discovery URL is hit more than # once then the response will be invalid and not point to COMPUTE_ADMIN resps = [{'json': self.TEST_DISCOVERY}, {'status_code': 500}] - self.requests.get(self.TEST_COMPUTE_ADMIN, resps) + self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps) body = 'SUCCESS' self.stub_url('GET', ['path'], text=body) @@ -138,7 +138,7 @@ class CommonIdentityTests(object): # register responses such that if the discovery URL is hit more than # once then the response will be invalid and not point to COMPUTE_ADMIN resps = [{'json': self.TEST_DISCOVERY}, {'status_code': 500}] - self.requests.get(self.TEST_COMPUTE_ADMIN, resps) + self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps) body = 'SUCCESS' self.stub_url('GET', ['path'], text=body) @@ -419,4 +419,5 @@ class GenericAuthPluginTests(utils.TestCase): self.assertIsNone(self.session.get_token()) self.assertEqual(self.auth.headers, self.session.get_auth_headers()) - self.assertNotIn('X-Auth-Token', self.requests.last_request.headers) + self.assertNotIn('X-Auth-Token', + self.requests_mock.last_request.headers) diff --git a/keystoneclient/tests/unit/auth/test_identity_v2.py b/keystoneclient/tests/unit/auth/test_identity_v2.py index 6d432a7..4c05ee2 100644 --- a/keystoneclient/tests/unit/auth/test_identity_v2.py +++ b/keystoneclient/tests/unit/auth/test_identity_v2.py @@ -200,7 +200,8 @@ class V2IdentityPlugin(utils.TestCase): resp = s.get('/path', endpoint_filter=endpoint_filter) self.assertEqual(resp.status_code, 200) - self.assertEqual(self.requests.last_request.url, base_url + '/path') + self.assertEqual(self.requests_mock.last_request.url, + base_url + '/path') def test_service_url(self): endpoint_filter = {'service_type': 'compute', diff --git a/keystoneclient/tests/unit/auth/test_identity_v3.py b/keystoneclient/tests/unit/auth/test_identity_v3.py index e7eed40..c01b39f 100644 --- a/keystoneclient/tests/unit/auth/test_identity_v3.py +++ b/keystoneclient/tests/unit/auth/test_identity_v3.py @@ -385,7 +385,8 @@ class V3IdentityPlugin(utils.TestCase): resp = s.get('/path', endpoint_filter=endpoint_filter) self.assertEqual(resp.status_code, 200) - self.assertEqual(self.requests.last_request.url, base_url + '/path') + self.assertEqual(self.requests_mock.last_request.url, + base_url + '/path') def test_service_url(self): endpoint_filter = {'service_type': 'compute', @@ -448,7 +449,8 @@ class V3IdentityPlugin(utils.TestCase): {'status_code': 200, 'json': self.TEST_RESPONSE_DICT, 'headers': {'X-Subject-Token': 'token2'}}] - self.requests.post('%s/auth/tokens' % self.TEST_URL, auth_responses) + self.requests_mock.post('%s/auth/tokens' % self.TEST_URL, + auth_responses) a = v3.Password(self.TEST_URL, username=self.TEST_USER, password=self.TEST_PASS) @@ -488,7 +490,7 @@ class V3IdentityPlugin(utils.TestCase): auth_url = self.TEST_URL + '/auth/tokens' self.assertEqual(auth_url, a.token_url) self.assertEqual(auth_url + '?nocatalog', - self.requests.last_request.url) + self.requests_mock.last_request.url) def test_symbols(self): self.assertIs(v3.AuthMethod, v3_base.AuthMethod) diff --git a/keystoneclient/tests/unit/auth/test_token_endpoint.py b/keystoneclient/tests/unit/auth/test_token_endpoint.py index 4b5f82c..b0be8f1 100644 --- a/keystoneclient/tests/unit/auth/test_token_endpoint.py +++ b/keystoneclient/tests/unit/auth/test_token_endpoint.py @@ -23,7 +23,7 @@ class TokenEndpointTest(utils.TestCase): TEST_URL = 'http://server/prefix' def test_basic_case(self): - self.requests.get(self.TEST_URL, text='body') + self.requests_mock.get(self.TEST_URL, text='body') a = token_endpoint.Token(self.TEST_URL, self.TEST_TOKEN) s = session.Session(auth=a) diff --git a/keystoneclient/tests/unit/auth/utils.py b/keystoneclient/tests/unit/auth/utils.py index 6580c73..87c2b62 100644 --- a/keystoneclient/tests/unit/auth/utils.py +++ b/keystoneclient/tests/unit/auth/utils.py @@ -128,7 +128,7 @@ class GenericPluginTestCase(utils.TestCase): auth_ref = auth.get_auth_ref(self.session) self.assertIsInstance(auth_ref, access.AccessInfoV3) self.assertEqual(self.TEST_URL + 'v3/auth/tokens', - self.requests.last_request.url) + self.requests_mock.last_request.url) self.assertIsInstance(auth._plugin, self.V3_PLUGIN_CLASS) return auth @@ -137,7 +137,7 @@ class GenericPluginTestCase(utils.TestCase): auth_ref = auth.get_auth_ref(self.session) self.assertIsInstance(auth_ref, access.AccessInfoV2) self.assertEqual(self.TEST_URL + 'v2.0/tokens', - self.requests.last_request.url) + self.requests_mock.last_request.url) self.assertIsInstance(auth._plugin, self.V2_PLUGIN_CLASS) return auth diff --git a/keystoneclient/tests/unit/test_discovery.py b/keystoneclient/tests/unit/test_discovery.py index 6c208a3..76aaf03 100644 --- a/keystoneclient/tests/unit/test_discovery.py +++ b/keystoneclient/tests/unit/test_discovery.py @@ -242,7 +242,7 @@ class AvailableVersionsTests(utils.TestCase): for path, text in six.iteritems(examples): url = "%s%s" % (BASE_URL, path) - self.requests.get(url, status_code=300, text=text) + self.requests_mock.get(url, status_code=300, text=text) versions = discover.available_versions(url) for v in versions: @@ -252,7 +252,7 @@ class AvailableVersionsTests(utils.TestCase): matchers.Contains(n))) def test_available_versions_individual(self): - self.requests.get(V3_URL, status_code=200, text=V3_VERSION_ENTRY) + self.requests_mock.get(V3_URL, status_code=200, text=V3_VERSION_ENTRY) versions = discover.available_versions(V3_URL) @@ -263,7 +263,7 @@ class AvailableVersionsTests(utils.TestCase): self.assertIn('links', v) def test_available_keystone_data(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) versions = discover.available_versions(BASE_URL) self.assertEqual(2, len(versions)) @@ -278,7 +278,7 @@ class AvailableVersionsTests(utils.TestCase): def test_available_cinder_data(self): text = jsonutils.dumps(CINDER_EXAMPLES) - self.requests.get(BASE_URL, status_code=300, text=text) + self.requests_mock.get(BASE_URL, status_code=300, text=text) versions = discover.available_versions(BASE_URL) self.assertEqual(2, len(versions)) @@ -294,7 +294,7 @@ class AvailableVersionsTests(utils.TestCase): def test_available_glance_data(self): text = jsonutils.dumps(GLANCE_EXAMPLES) - self.requests.get(BASE_URL, status_code=200, text=text) + self.requests_mock.get(BASE_URL, status_code=200, text=text) versions = discover.available_versions(BASE_URL) self.assertEqual(5, len(versions)) @@ -311,9 +311,9 @@ class AvailableVersionsTests(utils.TestCase): class ClientDiscoveryTests(utils.TestCase): def assertCreatesV3(self, **kwargs): - self.requests.post('%s/auth/tokens' % V3_URL, - text=V3_AUTH_RESPONSE, - headers={'X-Subject-Token': V3_TOKEN}) + self.requests_mock.post('%s/auth/tokens' % V3_URL, + text=V3_AUTH_RESPONSE, + headers={'X-Subject-Token': V3_TOKEN}) kwargs.setdefault('username', 'foo') kwargs.setdefault('password', 'bar') @@ -322,7 +322,7 @@ class ClientDiscoveryTests(utils.TestCase): return keystone def assertCreatesV2(self, **kwargs): - self.requests.post("%s/tokens" % V2_URL, text=V2_AUTH_RESPONSE) + self.requests_mock.post("%s/tokens" % V2_URL, text=V2_AUTH_RESPONSE) kwargs.setdefault('username', 'foo') kwargs.setdefault('password', 'bar') @@ -345,78 +345,78 @@ class ClientDiscoveryTests(utils.TestCase): client.Client, **kwargs) def test_discover_v3(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) self.assertCreatesV3(auth_url=BASE_URL) def test_discover_v2(self): - self.requests.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) - self.requests.post("%s/tokens" % V2_URL, text=V2_AUTH_RESPONSE) + self.requests_mock.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) + self.requests_mock.post("%s/tokens" % V2_URL, text=V2_AUTH_RESPONSE) self.assertCreatesV2(auth_url=BASE_URL) def test_discover_endpoint_v2(self): - self.requests.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) self.assertCreatesV2(endpoint=BASE_URL, token='fake-token') def test_discover_endpoint_v3(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) self.assertCreatesV3(endpoint=BASE_URL, token='fake-token') def test_discover_invalid_major_version(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) self.assertVersionNotAvailable(auth_url=BASE_URL, version=5) def test_discover_200_response_fails(self): - self.requests.get(BASE_URL, text='ok') + self.requests_mock.get(BASE_URL, text='ok') self.assertDiscoveryFailure(auth_url=BASE_URL) def test_discover_minor_greater_than_available_fails(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) self.assertVersionNotAvailable(endpoint=BASE_URL, version=3.4) def test_discover_individual_version_v2(self): - self.requests.get(V2_URL, text=V2_VERSION_ENTRY) + self.requests_mock.get(V2_URL, text=V2_VERSION_ENTRY) self.assertCreatesV2(auth_url=V2_URL) def test_discover_individual_version_v3(self): - self.requests.get(V3_URL, text=V3_VERSION_ENTRY) + self.requests_mock.get(V3_URL, text=V3_VERSION_ENTRY) self.assertCreatesV3(auth_url=V3_URL) def test_discover_individual_endpoint_v2(self): - self.requests.get(V2_URL, text=V2_VERSION_ENTRY) + self.requests_mock.get(V2_URL, text=V2_VERSION_ENTRY) self.assertCreatesV2(endpoint=V2_URL, token='fake-token') def test_discover_individual_endpoint_v3(self): - self.requests.get(V3_URL, text=V3_VERSION_ENTRY) + self.requests_mock.get(V3_URL, text=V3_VERSION_ENTRY) self.assertCreatesV3(endpoint=V3_URL, token='fake-token') def test_discover_fail_to_create_bad_individual_version(self): - self.requests.get(V2_URL, text=V2_VERSION_ENTRY) - self.requests.get(V3_URL, text=V3_VERSION_ENTRY) + self.requests_mock.get(V2_URL, text=V2_VERSION_ENTRY) + self.requests_mock.get(V3_URL, text=V3_VERSION_ENTRY) self.assertVersionNotAvailable(auth_url=V2_URL, version=3) self.assertVersionNotAvailable(auth_url=V3_URL, version=2) def test_discover_unstable_versions(self): version_list = fixture.DiscoveryList(BASE_URL, v3_status='beta') - self.requests.get(BASE_URL, status_code=300, json=version_list) + self.requests_mock.get(BASE_URL, status_code=300, json=version_list) self.assertCreatesV2(auth_url=BASE_URL) self.assertVersionNotAvailable(auth_url=BASE_URL, version=3) self.assertCreatesV3(auth_url=BASE_URL, unstable=True) def test_discover_forwards_original_ip(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) ip = '192.168.1.1' self.assertCreatesV3(auth_url=BASE_URL, original_ip=ip) - self.assertThat(self.requests.last_request.headers['forwarded'], + self.assertThat(self.requests_mock.last_request.headers['forwarded'], matchers.Contains(ip)) def test_discover_bad_args(self): @@ -424,7 +424,7 @@ class ClientDiscoveryTests(utils.TestCase): client.Client) def test_discover_bad_response(self): - self.requests.get(BASE_URL, status_code=300, json={'FOO': 'BAR'}) + self.requests_mock.get(BASE_URL, status_code=300, json={'FOO': 'BAR'}) self.assertDiscoveryFailure(auth_url=BASE_URL) def test_discovery_ignore_invalid(self): @@ -433,40 +433,40 @@ class ClientDiscoveryTests(utils.TestCase): 'media-types': V3_MEDIA_TYPES, 'status': 'stable', 'updated': UPDATED}] - self.requests.get(BASE_URL, status_code=300, - text=_create_version_list(resp)) + self.requests_mock.get(BASE_URL, status_code=300, + text=_create_version_list(resp)) self.assertDiscoveryFailure(auth_url=BASE_URL) def test_ignore_entry_without_links(self): v3 = V3_VERSION.copy() v3['links'] = [] - self.requests.get(BASE_URL, status_code=300, - text=_create_version_list([v3, V2_VERSION])) + self.requests_mock.get(BASE_URL, status_code=300, + text=_create_version_list([v3, V2_VERSION])) self.assertCreatesV2(auth_url=BASE_URL) def test_ignore_entry_without_status(self): v3 = V3_VERSION.copy() del v3['status'] - self.requests.get(BASE_URL, status_code=300, - text=_create_version_list([v3, V2_VERSION])) + self.requests_mock.get(BASE_URL, status_code=300, + text=_create_version_list([v3, V2_VERSION])) self.assertCreatesV2(auth_url=BASE_URL) def test_greater_version_than_required(self): versions = fixture.DiscoveryList(BASE_URL, v3_id='v3.6') - self.requests.get(BASE_URL, json=versions) + self.requests_mock.get(BASE_URL, json=versions) self.assertCreatesV3(auth_url=BASE_URL, version=(3, 4)) def test_lesser_version_than_required(self): versions = fixture.DiscoveryList(BASE_URL, v3_id='v3.4') - self.requests.get(BASE_URL, json=versions) + self.requests_mock.get(BASE_URL, json=versions) self.assertVersionNotAvailable(auth_url=BASE_URL, version=(3, 6)) def test_bad_response(self): - self.requests.get(BASE_URL, status_code=300, text="Ugly Duckling") + self.requests_mock.get(BASE_URL, status_code=300, text="Ugly Duckling") self.assertDiscoveryFailure(auth_url=BASE_URL) def test_pass_client_arguments(self): - self.requests.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V2_VERSION_LIST) kwargs = {'original_ip': '100', 'use_keyring': False, 'stale_duration': 15} @@ -477,11 +477,11 @@ class ClientDiscoveryTests(utils.TestCase): self.assertFalse(cl.use_keyring) def test_overriding_stored_kwargs(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) - self.requests.post("%s/auth/tokens" % V3_URL, - text=V3_AUTH_RESPONSE, - headers={'X-Subject-Token': V3_TOKEN}) + self.requests_mock.post("%s/auth/tokens" % V3_URL, + text=V3_AUTH_RESPONSE, + headers={'X-Subject-Token': V3_TOKEN}) disc = discover.Discover(auth_url=BASE_URL, debug=False, username='foo') @@ -494,7 +494,9 @@ class ClientDiscoveryTests(utils.TestCase): self.assertEqual(client.password, 'bar') def test_available_versions(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_ENTRY) + self.requests_mock.get(BASE_URL, + status_code=300, + text=V3_VERSION_ENTRY) disc = discover.Discover(auth_url=BASE_URL) versions = disc.available_versions() @@ -509,7 +511,7 @@ class ClientDiscoveryTests(utils.TestCase): 'updated': UPDATED} versions = fixture.DiscoveryList() versions.add_version(V4_VERSION) - self.requests.get(BASE_URL, status_code=300, json=versions) + self.requests_mock.get(BASE_URL, status_code=300, json=versions) disc = discover.Discover(auth_url=BASE_URL) self.assertRaises(exceptions.DiscoveryFailure, @@ -517,14 +519,14 @@ class ClientDiscoveryTests(utils.TestCase): def test_discovery_fail_for_missing_v3(self): versions = fixture.DiscoveryList(v2=True, v3=False) - self.requests.get(BASE_URL, status_code=300, json=versions) + self.requests_mock.get(BASE_URL, status_code=300, json=versions) disc = discover.Discover(auth_url=BASE_URL) self.assertRaises(exceptions.DiscoveryFailure, disc.create_client, version=(3, 0)) def _do_discovery_call(self, token=None, **kwargs): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) if not token: token = uuid.uuid4().hex @@ -536,7 +538,7 @@ class ClientDiscoveryTests(utils.TestCase): # will default to true as there is a plugin on the session discover.Discover(s, auth_url=BASE_URL, **kwargs) - self.assertEqual(BASE_URL, self.requests.last_request.url) + self.assertEqual(BASE_URL, self.requests_mock.last_request.url) def test_setting_authenticated_true(self): token = uuid.uuid4().hex @@ -545,13 +547,14 @@ class ClientDiscoveryTests(utils.TestCase): def test_setting_authenticated_false(self): self._do_discovery_call(authenticated=False) - self.assertNotIn('X-Auth-Token', self.requests.last_request.headers) + self.assertNotIn('X-Auth-Token', + self.requests_mock.last_request.headers) class DiscoverQueryTests(utils.TestCase): def test_available_keystone_data(self): - self.requests.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) + self.requests_mock.get(BASE_URL, status_code=300, text=V3_VERSION_LIST) disc = discover.Discover(auth_url=BASE_URL) versions = disc.version_data() @@ -579,7 +582,7 @@ class DiscoverQueryTests(utils.TestCase): def test_available_cinder_data(self): text = jsonutils.dumps(CINDER_EXAMPLES) - self.requests.get(BASE_URL, status_code=300, text=text) + self.requests_mock.get(BASE_URL, status_code=300, text=text) v1_url = "%sv1/" % BASE_URL v2_url = "%sv2/" % BASE_URL @@ -610,7 +613,7 @@ class DiscoverQueryTests(utils.TestCase): def test_available_glance_data(self): text = jsonutils.dumps(GLANCE_EXAMPLES) - self.requests.get(BASE_URL, text=text) + self.requests_mock.get(BASE_URL, text=text) v1_url = "%sv1/" % BASE_URL v2_url = "%sv2/" % BASE_URL @@ -659,7 +662,7 @@ class DiscoverQueryTests(utils.TestCase): 'status': status, 'updated': UPDATED}] text = jsonutils.dumps({'versions': version_list}) - self.requests.get(BASE_URL, text=text) + self.requests_mock.get(BASE_URL, text=text) disc = discover.Discover(auth_url=BASE_URL) @@ -681,7 +684,7 @@ class DiscoverQueryTests(utils.TestCase): 'status': status, 'updated': UPDATED}] text = jsonutils.dumps({'versions': version_list}) - self.requests.get(BASE_URL, text=text) + self.requests_mock.get(BASE_URL, text=text) disc = discover.Discover(auth_url=BASE_URL) @@ -698,7 +701,7 @@ class DiscoverQueryTests(utils.TestCase): status = 'abcdef' version_list = fixture.DiscoveryList(BASE_URL, v2=False, v3_status=status) - self.requests.get(BASE_URL, json=version_list) + self.requests_mock.get(BASE_URL, json=version_list) disc = discover.Discover(auth_url=BASE_URL) versions = disc.version_data() @@ -727,7 +730,7 @@ class DiscoverQueryTests(utils.TestCase): }] text = jsonutils.dumps({'versions': version_list}) - self.requests.get(BASE_URL, text=text) + self.requests_mock.get(BASE_URL, text=text) disc = discover.Discover(auth_url=BASE_URL) diff --git a/keystoneclient/tests/unit/test_session.py b/keystoneclient/tests/unit/test_session.py index 1d01c3a..c4e07cb 100644 --- a/keystoneclient/tests/unit/test_session.py +++ b/keystoneclient/tests/unit/test_session.py @@ -38,7 +38,7 @@ class SessionTests(utils.TestCase): self.stub_url('GET', text='response') resp = session.get(self.TEST_URL) - self.assertEqual('GET', self.requests.last_request.method) + self.assertEqual('GET', self.requests_mock.last_request.method) self.assertEqual(resp.text, 'response') self.assertTrue(resp.ok) @@ -47,7 +47,7 @@ class SessionTests(utils.TestCase): self.stub_url('POST', text='response') resp = session.post(self.TEST_URL, json={'hello': 'world'}) - self.assertEqual('POST', self.requests.last_request.method) + self.assertEqual('POST', self.requests_mock.last_request.method) self.assertEqual(resp.text, 'response') self.assertTrue(resp.ok) self.assertRequestBodyIs(json={'hello': 'world'}) @@ -57,7 +57,7 @@ class SessionTests(utils.TestCase): self.stub_url('HEAD') resp = session.head(self.TEST_URL) - self.assertEqual('HEAD', self.requests.last_request.method) + self.assertEqual('HEAD', self.requests_mock.last_request.method) self.assertTrue(resp.ok) self.assertRequestBodyIs('') @@ -66,7 +66,7 @@ class SessionTests(utils.TestCase): self.stub_url('PUT', text='response') resp = session.put(self.TEST_URL, json={'hello': 'world'}) - self.assertEqual('PUT', self.requests.last_request.method) + self.assertEqual('PUT', self.requests_mock.last_request.method) self.assertEqual(resp.text, 'response') self.assertTrue(resp.ok) self.assertRequestBodyIs(json={'hello': 'world'}) @@ -76,7 +76,7 @@ class SessionTests(utils.TestCase): self.stub_url('DELETE', text='response') resp = session.delete(self.TEST_URL) - self.assertEqual('DELETE', self.requests.last_request.method) + self.assertEqual('DELETE', self.requests_mock.last_request.method) self.assertTrue(resp.ok) self.assertEqual(resp.text, 'response') @@ -85,7 +85,7 @@ class SessionTests(utils.TestCase): self.stub_url('PATCH', text='response') resp = session.patch(self.TEST_URL, json={'hello': 'world'}) - self.assertEqual('PATCH', self.requests.last_request.method) + self.assertEqual('PATCH', self.requests_mock.last_request.method) self.assertTrue(resp.ok) self.assertEqual(resp.text, 'response') self.assertRequestBodyIs(json={'hello': 'world'}) @@ -202,7 +202,7 @@ class SessionTests(utils.TestCase): m.assert_called_with(2.0) # we count retries so there will be one initial request + 3 retries - self.assertThat(self.requests.request_history, + self.assertThat(self.requests_mock.request_history, matchers.HasLength(retries + 1)) def test_uses_tcp_keepalive_by_default(self): @@ -234,14 +234,14 @@ class RedirectTests(utils.TestCase): redirect_kwargs.setdefault('text', self.DEFAULT_REDIRECT_BODY) for s, d in zip(self.REDIRECT_CHAIN, self.REDIRECT_CHAIN[1:]): - self.requests.register_uri(method, s, status_code=status_code, - headers={'Location': d}, - **redirect_kwargs) + self.requests_mock.register_uri(method, s, status_code=status_code, + headers={'Location': d}, + **redirect_kwargs) final_kwargs.setdefault('status_code', 200) final_kwargs.setdefault('text', self.DEFAULT_RESP_BODY) - self.requests.register_uri(method, self.REDIRECT_CHAIN[-1], - **final_kwargs) + self.requests_mock.register_uri(method, self.REDIRECT_CHAIN[-1], + **final_kwargs) def assertResponse(self, resp): self.assertEqual(resp.status_code, 200) @@ -405,7 +405,7 @@ class SessionAuthTests(utils.TestCase): base_url = AuthPlugin.SERVICE_URLS[service_type][interface] uri = "%s/%s" % (base_url.rstrip('/'), path.lstrip('/')) - self.requests.register_uri(method, uri, **kwargs) + self.requests_mock.register_uri(method, uri, **kwargs) def test_auth_plugin_default_with_plugin(self): self.stub_url('GET', base_url=self.TEST_URL, json=self.TEST_JSON) @@ -446,7 +446,7 @@ class SessionAuthTests(utils.TestCase): endpoint_filter={'service_type': service_type, 'interface': interface}) - self.assertEqual(self.requests.last_request.url, + self.assertEqual(self.requests_mock.last_request.url, AuthPlugin.SERVICE_URLS['compute']['public'] + path) self.assertEqual(resp.text, body) self.assertEqual(resp.status_code, status) @@ -468,7 +468,7 @@ class SessionAuthTests(utils.TestCase): def test_raises_exc_only_when_asked(self): # A request that returns a HTTP error should by default raise an # exception by default, if you specify raise_exc=False then it will not - self.requests.get(self.TEST_URL, status_code=401) + self.requests_mock.get(self.TEST_URL, status_code=401) sess = client_session.Session() self.assertRaises(exceptions.Unauthorized, sess.get, self.TEST_URL) @@ -480,8 +480,8 @@ class SessionAuthTests(utils.TestCase): passed = CalledAuthPlugin() sess = client_session.Session() - self.requests.get(CalledAuthPlugin.ENDPOINT + 'path', - status_code=200) + self.requests_mock.get(CalledAuthPlugin.ENDPOINT + 'path', + status_code=200) endpoint_filter = {'service_type': 'identity'} # no plugin with authenticated won't work @@ -504,8 +504,8 @@ class SessionAuthTests(utils.TestCase): sess = client_session.Session(fixed) - self.requests.get(CalledAuthPlugin.ENDPOINT + 'path', - status_code=200) + self.requests_mock.get(CalledAuthPlugin.ENDPOINT + 'path', + status_code=200) resp = sess.get('path', auth=passed, endpoint_filter={'service_type': 'identity'}) @@ -537,9 +537,9 @@ class SessionAuthTests(utils.TestCase): auth = CalledAuthPlugin(invalidate=True) sess = client_session.Session(auth=auth) - self.requests.get(self.TEST_URL, - [{'text': 'Failed', 'status_code': 401}, - {'text': 'Hello', 'status_code': 200}]) + self.requests_mock.get(self.TEST_URL, + [{'text': 'Failed', 'status_code': 401}, + {'text': 'Hello', 'status_code': 200}]) # allow_reauth=True is the default resp = sess.get(self.TEST_URL, authenticated=True) @@ -552,9 +552,9 @@ class SessionAuthTests(utils.TestCase): auth = CalledAuthPlugin(invalidate=True) sess = client_session.Session(auth=auth) - self.requests.get(self.TEST_URL, - [{'text': 'Failed', 'status_code': 401}, - {'text': 'Hello', 'status_code': 200}]) + self.requests_mock.get(self.TEST_URL, + [{'text': 'Failed', 'status_code': 401}, + {'text': 'Hello', 'status_code': 200}]) self.assertRaises(exceptions.Unauthorized, sess.get, self.TEST_URL, authenticated=True, allow_reauth=False) @@ -569,14 +569,14 @@ class SessionAuthTests(utils.TestCase): override_url = override_base + path resp_text = uuid.uuid4().hex - self.requests.get(override_url, text=resp_text) + self.requests_mock.get(override_url, text=resp_text) resp = sess.get(path, endpoint_override=override_base, endpoint_filter={'service_type': 'identity'}) self.assertEqual(resp_text, resp.text) - self.assertEqual(override_url, self.requests.last_request.url) + self.assertEqual(override_url, self.requests_mock.last_request.url) self.assertTrue(auth.get_token_called) self.assertFalse(auth.get_endpoint_called) @@ -589,14 +589,14 @@ class SessionAuthTests(utils.TestCase): url = self.TEST_URL + path resp_text = uuid.uuid4().hex - self.requests.get(url, text=resp_text) + self.requests_mock.get(url, text=resp_text) resp = sess.get(url, endpoint_override='http://someother.url', endpoint_filter={'service_type': 'identity'}) self.assertEqual(resp_text, resp.text) - self.assertEqual(url, self.requests.last_request.url) + self.assertEqual(url, self.requests_mock.last_request.url) self.assertTrue(auth.get_token_called) self.assertFalse(auth.get_endpoint_called) @@ -718,12 +718,12 @@ class AdapterTest(utils.TestCase): adpt = adapter.Adapter(sess, endpoint_override=endpoint_override) response = uuid.uuid4().hex - self.requests.get(endpoint_url, text=response) + self.requests_mock.get(endpoint_url, text=response) resp = adpt.get(path) self.assertEqual(response, resp.text) - self.assertEqual(endpoint_url, self.requests.last_request.url) + self.assertEqual(endpoint_url, self.requests_mock.last_request.url) self.assertEqual(endpoint_override, adpt.get_endpoint()) @@ -760,7 +760,7 @@ class AdapterTest(utils.TestCase): self.assertEqual(retries, m.call_count) # we count retries so there will be one initial request + 2 retries - self.assertThat(self.requests.request_history, + self.assertThat(self.requests_mock.request_history, matchers.HasLength(retries + 1)) def test_user_and_project_id(self):