openstack/python-keystoneclient
Code Issues Proposed changes

Don't use private last_request variable

Browse Source 
This is exposed in more recent versions of httpretty via a public method
rather than accessing it from the class.

Change-Id: I86949d94ac9b647ef577ee7db0ec4d664d6bc60b
This commit is contained in:
Jamie Lennox
2014-02-13 11:34:04 +10:00
parent bfc5f73f75
commit d0f129637f
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -291,9 +291,9 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
def assertLastPath(self, path): def assertLastPath(self, path):
if path: if path:
self.assertEqual(path, httpretty.httpretty.last_request.path) self.assertEqual(path, httpretty.last_request().path)
else: else:
self.assertIsInstance(httpretty.httpretty.last_request, self.assertIsInstance(httpretty.last_request(),
httpretty.core.HTTPrettyRequestEmpty) httpretty.core.HTTPrettyRequestEmpty)
if tuple(sys.version_info)[0:2] < (2, 7): if tuple(sys.version_info)[0:2] < (2, 7):
@@ -371,7 +371,7 @@ class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
super(DiabloAuthTokenMiddlewareTest, self).setUp( super(DiabloAuthTokenMiddlewareTest, self).setUp(
expected_env=expected_env) expected_env=expected_env)
httpretty.httpretty.reset() httpretty.reset()
httpretty.enable() httpretty.enable()
self.addCleanup(httpretty.disable) self.addCleanup(httpretty.disable)
@@ -1108,7 +1108,7 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
self.assertEqual(f.read(), data) self.assertEqual(f.read(), data)
self.assertEqual("/testadmin/v2.0/certificates/signing", self.assertEqual("/testadmin/v2.0/certificates/signing",
httpretty.httpretty.last_request.path) httpretty.last_request().path)
def test_fetch_signing_ca(self): def test_fetch_signing_ca(self):
data = 'FAKE CA' data = 'FAKE CA'
@@ -1121,7 +1121,7 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
self.assertEqual(f.read(), data) self.assertEqual(f.read(), data)
self.assertEqual("/testadmin/v2.0/certificates/ca", self.assertEqual("/testadmin/v2.0/certificates/ca",
httpretty.httpretty.last_request.path) httpretty.last_request().path)
def test_prefix_trailing_slash(self): def test_prefix_trailing_slash(self):
self.conf['auth_admin_prefix'] = '/newadmin/' self.conf['auth_admin_prefix'] = '/newadmin/'
@@ -1138,12 +1138,12 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
self.middleware.fetch_ca_cert() self.middleware.fetch_ca_cert()
self.assertEqual('/newadmin/v2.0/certificates/ca', self.assertEqual('/newadmin/v2.0/certificates/ca',
httpretty.httpretty.last_request.path) httpretty.last_request().path)
self.middleware.fetch_signing_cert() self.middleware.fetch_signing_cert()
self.assertEqual('/newadmin/v2.0/certificates/signing', self.assertEqual('/newadmin/v2.0/certificates/signing',
httpretty.httpretty.last_request.path) httpretty.last_request().path)
def test_without_prefix(self): def test_without_prefix(self):
self.conf['auth_admin_prefix'] = '' self.conf['auth_admin_prefix'] = ''
@@ -1160,12 +1160,12 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
self.middleware.fetch_ca_cert() self.middleware.fetch_ca_cert()
self.assertEqual('/v2.0/certificates/ca', self.assertEqual('/v2.0/certificates/ca',
httpretty.httpretty.last_request.path) httpretty.last_request().path)
self.middleware.fetch_signing_cert() self.middleware.fetch_signing_cert()
self.assertEqual('/v2.0/certificates/signing', self.assertEqual('/v2.0/certificates/signing',
httpretty.httpretty.last_request.path) httpretty.last_request().path)
def network_error_response(method, uri, headers): def network_error_response(method, uri, headers):
@@ -1208,7 +1208,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
'revoked_token_hash': self.examples.REVOKED_TOKEN_HASH 'revoked_token_hash': self.examples.REVOKED_TOKEN_HASH
} }
httpretty.httpretty.reset() httpretty.reset()
httpretty.enable() httpretty.enable()
self.addCleanup(httpretty.disable) self.addCleanup(httpretty.disable)
@@ -1340,7 +1340,7 @@ class CrossVersionAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertEqual("/testadmin/v2.0/tokens/%s" % self.assertEqual("/testadmin/v2.0/tokens/%s" %
self.examples.UUID_TOKEN_DEFAULT, self.examples.UUID_TOKEN_DEFAULT,
httpretty.httpretty.last_request.path) httpretty.last_request().path)
class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest, class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
@@ -1390,7 +1390,7 @@ class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
'revoked_token_hash': self.examples.REVOKED_v3_TOKEN_HASH 'revoked_token_hash': self.examples.REVOKED_v3_TOKEN_HASH
} }
httpretty.httpretty.reset() httpretty.reset()
httpretty.enable() httpretty.enable()
self.addCleanup(httpretty.disable) self.addCleanup(httpretty.disable)

2
keystoneclient/tests/test_discovery.py
View File

@@ -318,7 +318,7 @@ class ClientDiscoveryTests(utils.TestCase):
ip = '192.168.1.1' ip = '192.168.1.1'
self.assertCreatesV3(auth_url=BASE_URL, original_ip=ip) self.assertCreatesV3(auth_url=BASE_URL, original_ip=ip)
self.assertThat(httpretty.httpretty.last_request.headers['forwarded'], self.assertThat(httpretty.last_request().headers['forwarded'],
matchers.Contains(ip)) matchers.Contains(ip))
def test_discover_bad_args(self): def test_discover_bad_args(self):