diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2017-01-25 15:25:28 -0600 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2017-01-25 15:25:32 -0600 |
| commit | d780e9e91fae608a8e810dc070b67299fd0b324c (patch) | |
| tree | 8698c6fe6762e2cf6ba2f256c1ca9e8e0df9356f /openstackclient/tests/functional/identity | |
| parent | b69b539a422860bfb402093ff9d93a1b6e338b26 (diff) | |
| download | python-openstackclient-d780e9e91fae608a8e810dc070b67299fd0b324c.tar.gz | |
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
Diffstat (limited to 'openstackclient/tests/functional/identity')
| -rw-r--r-- | openstackclient/tests/functional/identity/v2/common.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/functional/identity/v3/common.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/tests/functional/identity/v2/common.py b/openstackclient/tests/functional/identity/v2/common.py index b390c5bc..fe49a225 100644 --- a/openstackclient/tests/functional/identity/v2/common.py +++ b/openstackclient/tests/functional/identity/v2/common.py @@ -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') diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py index 3b6fc27b..eabf96d5 100644 --- a/openstackclient/tests/functional/identity/v3/common.py +++ b/openstackclient/tests/functional/identity/v3/common.py @@ -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') |