openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix Identity functional tests to not require OS_AUTH_URL"

Browse Source
This commit is contained in:
Jenkins 2017-01-26 01:19:17 +00:00 committed by Gerrit Code Review
commit cb74397215
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/tests/functional/identity/v2/common.py
View File

@ -43,8 +43,8 @@ class IdentityTests(base.TestCase):
# prepare v2 env # prepare v2 env
os.environ['OS_IDENTITY_API_VERSION'] = '2.0' os.environ['OS_IDENTITY_API_VERSION'] = '2.0'
auth_url = os.environ.get('OS_AUTH_URL') auth_url = os.environ.get('OS_AUTH_URL')
auth_url = auth_url.replace('v3', 'v2.0') if auth_url:
os.environ['OS_AUTH_URL'] = auth_url os.environ['OS_AUTH_URL'] = auth_url.replace('v3', 'v2.0')
# create dummy project # create dummy project
cls.project_name = data_utils.rand_name('TestProject') cls.project_name = data_utils.rand_name('TestProject')

4
openstackclient/tests/functional/identity/v3/common.py
View File

@ -56,8 +56,8 @@ class IdentityTests(base.TestCase):
# prepare v3 env # prepare v3 env
os.environ['OS_IDENTITY_API_VERSION'] = '3' os.environ['OS_IDENTITY_API_VERSION'] = '3'
auth_url = os.environ.get('OS_AUTH_URL') auth_url = os.environ.get('OS_AUTH_URL')
auth_url = auth_url.replace('v2.0', 'v3') if auth_url:
os.environ['OS_AUTH_URL'] = auth_url os.environ['OS_AUTH_URL'] = auth_url.replace('v2.0', 'v3')
# create dummy domain # create dummy domain
cls.domain_name = data_utils.rand_name('TestDomain') cls.domain_name = data_utils.rand_name('TestDomain')