From 7bc114bfe5b986a61a2603770bbf63e09bdfa16f Mon Sep 17 00:00:00 2001 From: Cao Xuan Hoang Date: Mon, 26 Sep 2016 10:46:38 +0700 Subject: [PATCH] Using assertIsNotNone() instead of assertIsNot(None) Following OpenStack Style Guidelines[1]: [H203] Unit test assertions tend to give better messages for more specific assertions. As a result, assertIsNotNone(...) is preferred over assertNotEqual(None, ...) and assertIsNot(None, ...) [1]http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises Change-Id: Ie421629e0c78516595086510ba74130bfe6d1086 --- heat/tests/convergence/scenarios/update_remove_rollback.py | 2 +- heat/tests/convergence/scenarios/update_replace.py | 2 +- heat/tests/convergence/scenarios/update_user_replace.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/tests/convergence/scenarios/update_remove_rollback.py b/heat/tests/convergence/scenarios/update_remove_rollback.py index 2a942330b4..881e78e706 100644 --- a/heat/tests/convergence/scenarios/update_remove_rollback.py +++ b/heat/tests/convergence/scenarios/update_remove_rollback.py @@ -21,7 +21,7 @@ def store_b_uuid(): def check_b_not_replaced(): test.assertEqual(b_uuid, next(iter(reality.resources_by_logical_name('B'))).uuid) - test.assertIsNot(b_uuid, None) + test.assertIsNotNone(b_uuid) example_template = Template({ 'A': RsrcDef({}, []), diff --git a/heat/tests/convergence/scenarios/update_replace.py b/heat/tests/convergence/scenarios/update_replace.py index e74b0e3f65..2146bc1aed 100644 --- a/heat/tests/convergence/scenarios/update_replace.py +++ b/heat/tests/convergence/scenarios/update_replace.py @@ -21,7 +21,7 @@ def store_c_uuid(): def check_c_replaced(): test.assertNotEqual(c_uuid, next(iter(reality.resources_by_logical_name('C'))).uuid) - test.assertIsNot(c_uuid, None) + test.assertIsNotNone(c_uuid) example_template = Template({ diff --git a/heat/tests/convergence/scenarios/update_user_replace.py b/heat/tests/convergence/scenarios/update_user_replace.py index 089e005bba..937b72cefb 100644 --- a/heat/tests/convergence/scenarios/update_user_replace.py +++ b/heat/tests/convergence/scenarios/update_user_replace.py @@ -21,7 +21,7 @@ def store_c_uuid(): def check_c_replaced(): test.assertNotEqual(c_uuid, next(iter(reality.resources_by_logical_name('newC'))).uuid) - test.assertIsNot(c_uuid, None) + test.assertIsNotNone(c_uuid) example_template = Template({