Merge "Strip trailing slashes in test helper method"

2017-04-20 19:05:04 +00:00 · 2017-04-20 19:05:04 +00:00 · d5f5c70b90
commit d5f5c70b90
parent b32f082f43 d5396cf35c
1 changed files with 3 additions and 0 deletions
--- a/shade/tests/unit/base.py
+++ b/shade/tests/unit/base.py
@ -179,6 +179,9 @@ class RequestsMockTestCase(BaseTestCase):
                     qs_elements=None):
        endpoint_url = self.cloud.endpoint_for(
            service_type=service_type, interface=interface)
+        # Strip trailing slashes, so as not to produce double-slashes below
+        if endpoint_url.endswith('/'):
+            endpoint_url = endpoint_url[:-1]
        to_join = [endpoint_url]
        qs = ''
        if base_url_append: