openstack
/
tricircle
Code Issues Proposed changes

Replace assertTrue/False(A) from assertEqual(A, True/False) 

This patch replaces assertEqual(A, True/False) to assertTrue/False(A)

Change-Id: I077581c2514825b1ba3af82f8c0ebdaf934740af
This commit is contained in:
ritesh.arya 2017-07-03 15:20:08 +05:30
parent b0a5c6c684
commit c6e6c343e2
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tricircle/tests/unit/common/test_lock_handle.py
View File

@ -64,7 +64,7 @@ class LockHandleTest(unittest.TestCase):
is_new, b_resource_id = lock_handle.get_or_create_element(
self.t_ctx, self.q_ctx, self.project_id, pod, ele, _type, body,
list_resource, create_resource)
self.assertEqual(is_new, True)
self.assertTrue(is_new)
self.assertEqual(b_resource_id, RES[0]['id'])
def test_get_create_element_routing_valid(self):
@ -79,7 +79,7 @@ class LockHandleTest(unittest.TestCase):
is_new, b_resource_id = lock_handle.get_or_create_element(
self.t_ctx, self.q_ctx, self.project_id, pod, ele, _type, body,
list_resource, create_resource)
self.assertEqual(is_new, False)
self.assertFalse(is_new)
self.assertEqual(b_resource_id, RES[0]['id'])
def test_get_create_element_routing_expire_resource_exist(self):
@ -100,7 +100,7 @@ class LockHandleTest(unittest.TestCase):
is_new, b_resource_id = lock_handle.get_or_create_element(
self.t_ctx, self.q_ctx, self.project_id, pod, ele, _type, body,
list_resource, create_resource)
self.assertEqual(is_new, True)
self.assertTrue(is_new)
self.assertEqual(b_resource_id, RES[0]['id'])
def test_get_create_element_routing_expire_resource_missing(self):
@ -119,7 +119,7 @@ class LockHandleTest(unittest.TestCase):
is_new, b_resource_id = lock_handle.get_or_create_element(
self.t_ctx, self.q_ctx, self.project_id, pod, ele, _type, body,
list_resource, create_resource)
self.assertEqual(is_new, True)
self.assertTrue(is_new)
self.assertEqual(b_resource_id, RES[0]['id'])
def test_get_create_element_routing_conflict(self):

24
tricircle/tests/unit/common/test_policy.py
View File

@ -46,36 +46,36 @@ class PolicyTestCase(unittest.TestCase):
def test_enforce_nonexistent_action_throws(self):
action = "example:non_exist"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, False)
self.assertFalse(result)
def test_enforce_bad_action_throws(self):
action = "example:denied"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, False)
self.assertFalse(result)
def test_enforce_good_action(self):
action = "example:allowed"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, True)
self.assertTrue(result)
def test_templatized_enforcement(self):
target_mine = {'project_id': 'fake'}
target_not_mine = {'project_id': 'another'}
action = "example:my_file"
result = policy.enforce(self.context, action, target_mine)
self.assertEqual(result, True)
self.assertTrue(result)
result = policy.enforce(self.context, action, target_not_mine)
self.assertEqual(result, False)
self.assertFalse(result)
def test_early_AND_enforcement(self):
action = "example:early_and_fail"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, False)
self.assertFalse(result)
def test_early_OR_enforcement(self):
action = "example:early_or_success"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, True)
self.assertTrue(result)
def test_ignore_case_role_check(self):
lowercase_action = "example:lowercase_admin"
@ -84,9 +84,9 @@ class PolicyTestCase(unittest.TestCase):
tenant_id='fake',
roles=['AdMiN'])
result = policy.enforce(admin_context, lowercase_action, self.target)
self.assertEqual(result, True)
self.assertTrue(result)
result = policy.enforce(admin_context, uppercase_action, self.target)
self.assertEqual(result, True)
self.assertTrue(result)
class DefaultPolicyTestCase(unittest.TestCase):
@ -111,13 +111,13 @@ class DefaultPolicyTestCase(unittest.TestCase):
def test_policy_called(self):
result = policy.enforce(self.context, "example:exist", {})
self.assertEqual(result, False)
self.assertFalse(result)
def test_not_found_policy_calls_default(self):
result = policy.enforce(self.context, "example:noexist", {})
self.assertEqual(result, True)
self.assertTrue(result)
def test_default_not_found(self):
self._set_rules("default_noexist")
result = policy.enforce(self.context, "example:noexist", {})
self.assertEqual(result, False)
self.assertFalse(result)

20
tricircle/tests/unit/network/test_central_plugin.py
View File

@ -1159,7 +1159,7 @@ class PluginTest(unittest.TestCase,
update_body['network']['description'])
self.assertEqual(top_net['admin_state_up'],
update_body['network']['admin_state_up'])
self.assertEqual(top_net['shared'], True)
self.assertTrue(top_net['shared'])
bottom_net = fake_client.get_networks(t_ctx, b_net_id)
# name is set to top resource id, which is used by lock_handle to
@ -1171,7 +1171,7 @@ class PluginTest(unittest.TestCase,
update_body['network']['description'])
self.assertEqual(bottom_net['admin_state_up'],
update_body['network']['admin_state_up'])
self.assertEqual(bottom_net['shared'], True)
self.assertTrue(bottom_net['shared'])
@patch.object(directory, 'get_plugin', new=fake_get_plugin)
@patch.object(context, 'get_context_from_neutron_context')
@ -2096,7 +2096,7 @@ class PluginTest(unittest.TestCase,
# for supporting multi-gateway l3 mode, we allow attaching a network
# to a local router if the regions of the network include the region
# of the router
self.assertEqual(True, is_local_router)
self.assertTrue(is_local_router)
router_az_hints = '["az_name_1"]'
net_az_hints = '["az_name_1", "pod_2"]'
@ -2121,7 +2121,7 @@ class PluginTest(unittest.TestCase,
# for supporting multi-gateway l3 mode, we allow attaching a network
# to a local router if the regions of the network include the region
# of the router
self.assertEqual(True, is_local_router)
self.assertTrue(is_local_router)
router_az_hints = None
net_az_hints = '["pod_1", "az_name_2"]'
@ -2132,7 +2132,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, False)
self.assertFalse(is_local_router)
router_az_hints = None
net_az_hints = None
@ -2143,7 +2143,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, False)
self.assertFalse(is_local_router)
router_az_hints = '["pod_1"]'
net_az_hints = '["pod_1"]'
@ -2154,7 +2154,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, True)
self.assertTrue(is_local_router)
router_az_hints = '["az_name_2"]'
net_az_hints = '["az_name_2"]'
@ -2165,7 +2165,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, False)
self.assertFalse(is_local_router)
router_az_hints = '["pod_1", "az_name_2"]'
net_az_hints = '["az_name_2"]'
@ -2177,7 +2177,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, False)
self.assertFalse(is_local_router)
net_az_hints = '["pod_1"]'
t_ctx.is_admin = True
@ -2199,7 +2199,7 @@ class PluginTest(unittest.TestCase,
net = fake_plugin.get_network(q_ctx, t_net_id)
is_local_router = helper.NetworkHelper.is_local_router(t_ctx, t_router)
fake_plugin.validate_router_net_location_match(t_ctx, router, net)
self.assertEqual(is_local_router, True)
self.assertTrue(is_local_router)
@patch.object(directory, 'get_plugin', new=fake_get_plugin)
@patch.object(driver.Pool, 'get_instance', new=fake_get_instance)

4
tricircle/tests/unit/network/test_central_trunk_plugin.py
View File

@ -529,12 +529,12 @@ class PluginTest(unittest.TestCase):
update_body)
self.assertEqual(updated_top_trunk['name'], 'new_name')
self.assertEqual(updated_top_trunk['description'], 'updated')
self.assertEqual(updated_top_trunk['admin_state_up'], False)
self.assertFalse(updated_top_trunk['admin_state_up'])
updated_btm_trunk = fake_plugin.get_trunk(q_ctx, t_trunk['id'])
self.assertEqual(updated_btm_trunk['name'], 'new_name')
self.assertEqual(updated_btm_trunk['description'], 'updated')
self.assertEqual(updated_btm_trunk['admin_state_up'], False)
self.assertFalse(updated_btm_trunk['admin_state_up'])
@patch.object(context, 'get_context_from_neutron_context',
new=fake_get_context_from_neutron_context)