From 2e6774462537a69be83e4ebdb8c574359163b071 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 7 Dec 2015 14:04:55 -0500 Subject: condensing python code in utils check_credentials comment said: TODO: there must be a short way to do this doing if os.environ["something"] == "" throws an error This does the same thing removing the try catches using conditionals and list functions Change-Id: I614e0aa49ab62aeeb738bdd36ef55452d585d8fb Signed-off-by: Dan Radez --- testcases/functest_utils.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'testcases/functest_utils.py') diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py index 59af2175e..d09ae8312 100644 --- a/testcases/functest_utils.py +++ b/testcases/functest_utils.py @@ -23,25 +23,8 @@ def check_credentials(): """ Check if the OpenStack credentials (openrc) are sourced """ - # TODO: there must be a short way to do this - # doing if os.environ["something"] == "" throws an error - try: - os.environ['OS_AUTH_URL'] - except KeyError: - return False - try: - os.environ['OS_USERNAME'] - except KeyError: - return False - try: - os.environ['OS_PASSWORD'] - except KeyError: - return False - try: - os.environ['OS_TENANT_NAME'] - except KeyError: - return False - return True + env_vars = ['OS_AUTH_URL','OS_USERNAME','OS_PASSWORD','OS_TENANT_NAME'] + return all(map(lambda v: v in os.environ and os.environ[v], env_vars)) def get_credentials(service): -- cgit 1.2.3-korg