openstack
/
openstacksdk
Code Issues Proposed changes

Remove mocking workaround from adapter 

We had a workaround in the adapter for places where we were mocking
internals of things. We're not longer doing that and are instead
appropriately using requests-mock, so we no longer need the workaround.

Change-Id: I4c9b6e784752f9ca2d1009553003913bad1761d0
This commit is contained in:
Monty Taylor 2018-11-01 10:00:17 -05:00
parent 728a3fae29
commit 999ff0eb7f
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack/_adapter.py
View File

@ -135,13 +135,7 @@ class OpenStackSDKAdapter(adapter.Adapter):
self, url, method, run_async=False, error_message=None,
raise_exc=False, connect_retries=1, *args, **kwargs):
name_parts = _extract_name(url, self.service_type)
# TODO(mordred) This if is in service of unit tests that are making
# calls without a service_type. It should be fixable once we shift
# to requests-mock and stop mocking internals.
if self.service_type:
name = '.'.join([self.service_type, method] + name_parts)
else:
name = '.'.join([method] + name_parts)
name = '.'.join([self.service_type, method] + name_parts)
request_method = functools.partial(
super(OpenStackSDKAdapter, self).request, url, method)