openstack/keystoneauth
Code Issues Proposed changes

Clean up a few review nits

Browse Source 
Remove four unneeded things in unit tests, updated a docstring,
and changed TypeError to ValueError.

Change-Id: Iad43ab2afa3767739ef3137b2691875520d052b3
This commit is contained in:
Monty Taylor 2017-06-26 14:53:59 -05:00 committed by Morgan Fainberg
parent 429b19c88c
commit 26f9345e18
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keystoneauth1/discover.py
View File

@ -115,12 +115,12 @@ def normalize_version_number(version):
def _normalize_version_args(version, min_version, max_version): def _normalize_version_args(version, min_version, max_version):
if version and (min_version or max_version): if version and (min_version or max_version):
raise TypeError( raise ValueError(
"version is mutually exclusive with min_version and" "version is mutually exclusive with min_version and"
" max_version") " max_version")
if min_version == 'latest' and max_version not in ( if min_version == 'latest' and max_version not in (
None, 'latest'): None, 'latest'):
raise TypeError( raise ValueError(
"min_version is 'latest' and max_version is {max_version}" "min_version is 'latest' and max_version is {max_version}"
" but is only allowed to be 'latest' or None".format( " but is only allowed to be 'latest' or None".format(
max_version=max_version)) max_version=max_version))
@ -872,7 +872,8 @@ class EndpointData(object):
:param bool allow_version_hack: Whether or not to allow version hacks :param bool allow_version_hack: Whether or not to allow version hacks
to be applied. (defaults to True) to be applied. (defaults to True)
:returns: A potential unversioned url :returns: A url that has been transformed by the regex hacks that
match the service_type.
""" """
return _VERSION_HACKS.get_discover_hack(self.service_type, self.url) return _VERSION_HACKS.get_discover_hack(self.service_type, self.url)

20
keystoneauth1/tests/unit/identity/test_identity_common.py
View File

@ -279,9 +279,6 @@ class CommonIdentityTests(object):
resps = [{'json': self.TEST_DISCOVERY}, {'status_code': 500}] resps = [{'json': self.TEST_DISCOVERY}, {'status_code': 500}]
self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps) self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps)
body = 'SUCCESS'
self.stub_url('GET', ['path'], text=body)
# now either of the two sessions I use, it should not cause a second # now either of the two sessions I use, it should not cause a second
# request to the discovery url. Calling discovery directly should also # request to the discovery url. Calling discovery directly should also
# not cause an additional request. # not cause an additional request.
@ -561,9 +558,6 @@ class CommonIdentityTests(object):
resps = [{'json': disc}, {'status_code': 500}] resps = [{'json': disc}, {'status_code': 500}]
self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps) self.requests_mock.get(self.TEST_COMPUTE_ADMIN, resps)
body = 'SUCCESS'
self.stub_url('GET', ['path'], text=body)
a = self.create_auth_plugin() a = self.create_auth_plugin()
s = session.Session(auth=a) s = session.Session(auth=a)
@ -620,9 +614,6 @@ class CommonIdentityTests(object):
href=self.TEST_VOLUME.versions['v2'].discovery.public, href=self.TEST_VOLUME.versions['v2'].discovery.public,
id='v2.0', status='SUPPORTED') id='v2.0', status='SUPPORTED')
body = 'SUCCESS'
self.stub_url('GET', ['path'], text=body)
a = self.create_auth_plugin() a = self.create_auth_plugin()
s = session.Session(auth=a) s = session.Session(auth=a)
@ -690,9 +681,6 @@ class CommonIdentityTests(object):
href=self.TEST_VOLUME.versions['v2'].discovery.public, href=self.TEST_VOLUME.versions['v2'].discovery.public,
id='v2.0', status='SUPPORTED') id='v2.0', status='SUPPORTED')
body = 'SUCCESS'
self.stub_url('GET', ['path'], text=body)
a = self.create_auth_plugin() a = self.create_auth_plugin()
s = session.Session(auth=a) s = session.Session(auth=a)
@ -754,10 +742,6 @@ class CommonIdentityTests(object):
expired_token = self.get_auth_data(expires=expires) expired_token = self.get_auth_data(expires=expires)
expired_auth_ref = access.create(body=expired_token) expired_auth_ref = access.create(body=expired_token)
body = 'SUCCESS'
self.stub_url('GET', ['path'],
base_url=self.TEST_COMPUTE_ADMIN, text=body)
a = self.create_auth_plugin(**kwargs) a = self.create_auth_plugin(**kwargs)
a.auth_ref = expired_auth_ref a.auth_ref = expired_auth_ref
return a return a
@ -1269,7 +1253,7 @@ class CatalogHackTests(utils.TestCase):
max_version='latest') max_version='latest')
self.assertEqual(self.V3_URL, endpoint) self.assertEqual(self.V3_URL, endpoint)
self.assertRaises(TypeError, sess.get_endpoint, self.assertRaises(ValueError, sess.get_endpoint,
service_type=self.IDENTITY, service_type=self.IDENTITY,
min_version='latest', max_version='3.0') min_version='latest', max_version='3.0')
@ -1355,7 +1339,7 @@ class CatalogHackTests(utils.TestCase):
self.assertEqual(self.V3_URL, endpoint) self.assertEqual(self.V3_URL, endpoint)
v2_m, common_m = stub_urls() v2_m, common_m = stub_urls()
self.assertRaises(TypeError, sess.get_endpoint, self.assertRaises(ValueError, sess.get_endpoint,
service_type=self.IDENTITY, version=3, service_type=self.IDENTITY, version=3,
min_version='2') min_version='2')