From 3e95a1cd0721924e89e2cfd2960d4736bc6c5588 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Tue, 23 Aug 2016 14:27:51 +0800 Subject: when create/get/update failed return None rather than False In openstack_util.py, when create/get/update network or other resources failed, False is returned, which is incompatible with success return value such as id, network_nic. JIRA: FUNCTEST-427 Change-Id: Id2f55d8524e5aff150ba6bfb799085377a63baa4 Signed-off-by: SerenaFeng --- testcases/OpenStack/tempest/run_tempest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testcases/OpenStack') diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index c143fffa..e41eec6a 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -132,12 +132,12 @@ def create_tempest_resources(): tenant_id = os_utils.create_tenant(keystone_client, TENANT_NAME, TENANT_DESCRIPTION) - if tenant_id == '': + if not tenant_id: logger.error("Error : Failed to create %s tenant" % TENANT_NAME) user_id = os_utils.create_user(keystone_client, USER_NAME, USER_PASSWORD, None, tenant_id) - if user_id == '': + if not user_id: logger.error("Error : Failed to create %s user" % USER_NAME) logger.debug("Creating private network for Tempest suite") -- cgit 1.2.3-korg