diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-26 01:19:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-26 01:19:17 +0000 |
| commit | cb74397215e65cecd37a118cc07bd8f66532ecf2 (patch) | |
| tree | 809b5688d68147c7f7b93704a70aaf8abf5f4f68 | |
| parent | 55ea0e5b39ef7584e4e764824ac6f18f1796b331 (diff) | |
| parent | d780e9e91fae608a8e810dc070b67299fd0b324c (diff) | |
| download | python-openstackclient-cb74397215e65cecd37a118cc07bd8f66532ecf2.tar.gz | |
Merge "Fix Identity functional tests to not require OS_AUTH_URL"
| -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 ad02f779..4f3e1801 100644 --- a/openstackclient/tests/functional/identity/v2/common.py +++ b/openstackclient/tests/functional/identity/v2/common.py @@ -43,8 +43,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 a509574c..1ec3ac92 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') |