From d780e9e91fae608a8e810dc070b67299fd0b324c Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 25 Jan 2017 15:25:28 -0600
Subject: [PATCH] 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
---
openstackclient/tests/functional/identity/v2/common.py | 4 ++--
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 b390c5bc15..fe49a22554 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 3b6fc27b97..eabf96d51c 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')