openstack
/
tempest
Code Issues Proposed changes

Merge "Fix version replacement when path"

This commit is contained in:
Jenkins 2016-04-14 09:21:06 +00:00 committed by Gerrit Code Review
parent 05b2336474 7729380f83
commit 9aa74e4de9
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/lib/auth.py
View File

@ -34,13 +34,15 @@ LOG = logging.getLogger(__name__)
def replace_version(url, new_version):
parts = urlparse.urlparse(url)
version_path = '/%s' % new_version
path = re.sub(r'(^|/)+v\d+(?:\.\d+)?',
version_path,
parts.path,
count=1)
path, subs = re.subn(r'(^|/)+v\d+(?:\.\d+)?',
version_path,
parts.path,
count=1)
if not subs:
path = '%s%s' % (parts.path.rstrip('/'), version_path)
url = urlparse.urlunparse((parts.scheme,
parts.netloc,
path or version_path,
path,
parts.params,
parts.query,
parts.fragment))

9
tempest/tests/lib/test_auth.py
View File

@ -597,21 +597,18 @@ class TestReplaceVersion(base.TestCase):
auth.replace_version('http://localhost:35357', 'v2.0'))
def test_no_version_base_solidus(self):
# TODO(blk-u): This doesn't look like it works as expected.
self.assertEqual(
'http://localhost:35357/',
'http://localhost:35357/v2.0',
auth.replace_version('http://localhost:35357/', 'v2.0'))
def test_no_version_path(self):
# TODO(blk-u): This doesn't look like it works as expected.
self.assertEqual(
'http://localhost/identity',
'http://localhost/identity/v2.0',
auth.replace_version('http://localhost/identity', 'v2.0'))
def test_no_version_path_solidus(self):
# TODO(blk-u): This doesn't look like it works as expected.
self.assertEqual(
'http://localhost/identity/',
'http://localhost/identity/v2.0',
auth.replace_version('http://localhost/identity/', 'v2.0'))
def test_path_version(self):