Skip to content

Commit c960b7d

Browse files
committed
fix: Revert service_url slash stripping to work with current generated unit tests
1 parent 8688f2f commit c960b7d

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

ibm_cloud_sdk_core/base_service.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,7 @@ def set_service_url(self, service_url: str) -> None:
164164
'The service url shouldn\'t start or end with curly brackets or quotes. '
165165
'Be sure to remove any {} and \" characters surrounding your service url'
166166
)
167-
if service_url is not None:
168-
self.service_url = service_url.rstrip('/') # remove trailing slash
169-
else:
170-
self.service_url = None
167+
self.service_url = service_url
171168

172169
def get_authenticator(self) -> Authenticator:
173170
"""Get the authenticator currently used by the service.

test/test_base_service.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -520,37 +520,37 @@ def test_json():
520520

521521
def test_trailing_slash():
522522
service = AnyServiceV1('2018-11-20', service_url='https://trailingSlash.com/', authenticator=NoAuthAuthenticator())
523-
assert service.service_url == 'https://trailingSlash.com'
523+
assert service.service_url == 'https://trailingSlash.com/'
524524
service.set_service_url('https://trailingSlash.com/')
525-
assert service.service_url == 'https://trailingSlash.com'
525+
assert service.service_url == 'https://trailingSlash.com/'
526526
req = service.prepare_request('POST',
527527
url='/trailingSlashPath/',
528528
headers={'X-opt-out': True},
529529
data={'hello': 'world'})
530-
assert req.get('url') == 'https://trailingSlash.com/trailingSlashPath'
530+
assert req.get('url') == 'https://trailingSlash.com//trailingSlashPath'
531531

532532
service = AnyServiceV1('2018-11-20', service_url='https://trailingSlash.com/', authenticator=NoAuthAuthenticator())
533-
assert service.service_url == 'https://trailingSlash.com'
533+
assert service.service_url == 'https://trailingSlash.com/'
534534
service.set_service_url('https://trailingSlash.com/')
535-
assert service.service_url == 'https://trailingSlash.com'
535+
assert service.service_url == 'https://trailingSlash.com/'
536536
req = service.prepare_request('POST',
537537
url='/',
538538
headers={'X-opt-out': True},
539539
data={'hello': 'world'})
540-
assert req.get('url') == 'https://trailingSlash.com'
540+
assert req.get('url') == 'https://trailingSlash.com/'
541541

542542
service.set_service_url(None)
543543
assert service.service_url is None
544544

545545
service = AnyServiceV1('2018-11-20', service_url='/', authenticator=NoAuthAuthenticator())
546-
assert service.service_url == ''
546+
assert service.service_url == '/'
547547
service.set_service_url('/')
548-
assert service.service_url == ''
549-
with pytest.raises(ValueError): # ValueError thrown because service_url is '' and falsey
550-
req = service.prepare_request('POST',
551-
url='/',
552-
headers={'X-opt-out': True},
553-
data={'hello': 'world'})
548+
assert service.service_url == '/'
549+
req = service.prepare_request('POST',
550+
url='/',
551+
headers={'X-opt-out': True},
552+
data={'hello': 'world'})
553+
assert req.get('url') == '/'
554554

555555
def test_service_url_not_set():
556556
service = BaseService(service_url='', authenticator=NoAuthAuthenticator())

0 commit comments

Comments
 (0)