Fix Identity functional tests to not require OS_AUTH_URL

The Identity functional tests had an assumption that OS_AUTH_URL would
always be present, but when running the functional tests and only setting
OS_CLOUD (using clouds.yaml for creds) this fell down.

Change-Id: Ie589d301f866b06d9f8be8deeb953e03bc01cf09
This commit is contained in:
Dean Troyer 2017-01-25 15:25:28 -06:00
parent b69b539a42
commit d780e9e91f
2 changed files with 4 additions and 4 deletions

View File

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

View File

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