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

5 files changed, 14 insertions, 10 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