diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-23 14:27:51 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-08-23 12:24:06 +0000 |
| commit | 777ea60355095a13bbad23ee33197b2815957969 (patch) | |
| tree | f7ab1aac20bed93d550f786ef82195c740151683 /testcases/features | |
| parent | e85b75eb3b9cba6b63dba2c17dfdbbdd25026102 (diff) | |
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 <feng.xiaowei@zte.com.cn>
(cherry picked from commit 3e95a1cd0721924e89e2cfd2960d4736bc6c5588)
Diffstat (limited to 'testcases/features')
| -rwxr-xr-x | testcases/features/promise.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 170f75494..f5db02617 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -87,7 +87,7 @@ def main(): logger.info("Creating tenant '%s'..." % TENANT_NAME) tenant_id = openstack_utils.create_tenant( keystone, TENANT_NAME, TENANT_DESCRIPTION) - if tenant_id == '': + if not tenant_id: logger.error("Error : Failed to create %s tenant" % TENANT_NAME) exit(-1) logger.debug("Tenant '%s' created successfully." % TENANT_NAME) @@ -114,7 +114,7 @@ def main(): user_id = openstack_utils.create_user( keystone, USER_NAME, USER_PWD, None, tenant_id) - if user_id == '': + if not user_id: logger.error("Error : Failed to create %s user" % USER_NAME) exit(-1) logger.debug("User '%s' created successfully." % USER_NAME) @@ -171,7 +171,7 @@ def main(): SUBNET_NAME, ROUTER_NAME, SUBNET_CIDR) - if network_dic is False: + if not network_dic: logger.error("Failed to create the private network...") exit(-1) |