openstack
/
astara
Code Issues Proposed changes

Use assertIsNone and assertLess 

Instead of using assertEqual(A, None) and assertTrue(A * B),
developers should use assertIsNone and assertLess.

Change-Id: I3f995f4150e96916904da5066af03ca50778444d
This commit is contained in:
Béla Vancsics 2016-03-02 16:53:47 +01:00 committed by mark mcclain
parent 3d96794fd7
commit 609e60ebf0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
astara/test/unit/api/test_nova_wrapper.py
View File

@ -189,7 +189,7 @@ class TestNovaWrapper(base.RugTestBase):
not_found = novaclient_exceptions.NotFound('instance_id')
self.client.servers.get.side_effect = not_found
result = self.nova.get_instance_by_id('instance_id')
self.assertEqual(result, None)
self.assertIsNone(result)
def test_destroy_instance(self):
self.nova.destroy_instance(self.INSTANCE_INFO)

4
astara/test/unit/common/test_hash_ring.py
View File

@ -167,7 +167,7 @@ class HashRingTestCase(base.RugTestBase):
nodes, conductors, hash_ring.HashRing(conductors),
new_conductors, hash_ring.HashRing(new_conductors))
self.assertTrue(len(delta) < num_nodes * redistribution_factor)
self.assertLess(len(delta), num_nodes * redistribution_factor)
def test_rebalance_stability_leave(self):
num_conductors = 10
@ -185,7 +185,7 @@ class HashRingTestCase(base.RugTestBase):
nodes, conductors, hash_ring.HashRing(conductors),
new_conductors, hash_ring.HashRing(new_conductors))
self.assertTrue(len(delta) < num_nodes * redistribution_factor)
self.assertLess(len(delta), num_nodes * redistribution_factor)
def test_more_replicas_than_hosts(self):
hosts = ['foo', 'bar']

2
astara/test/unit/drivers/test_loadbalancer.py
View File

@ -373,5 +373,5 @@ class LoadBalancerDriverTest(base.RugTestBase):
neutron.LoadBalancerGone
]
lb._ensure_cache(self.ctx)
self.assertEqual(lb._loadbalancer, None)
self.assertIsNone(lb._loadbalancer)
self.ctx.neutron.get_loadbalancer_detail.assert_called_with(lb.id)

6
astara/test/unit/drivers/test_router.py
View File

@ -68,7 +68,7 @@ class RouterDriverTest(base.RugTestBase):
def test__ensure_cache_no_router(self):
self.ctx.neutron.get_router_detail.return_value = None
rtr = self._init_driver()
self.assertEqual(rtr._router, None)
self.assertIsNone(rtr._router)
def test__ensure_cache_with_router(self):
rtr = self._init_driver()
@ -227,7 +227,7 @@ class RouterDriverTest(base.RugTestBase):
self.ctx.neutron.get_router_for_tenant.return_value = None
res = router.Router.get_resource_id_for_tenant(
self.ctx, 'fake_tenant_id', 'fake_message')
self.assertEqual(res, None)
self.assertIsNone(res)
self.ctx.neutron.get_router_for_tenant.assert_called_with(
'fake_tenant_id')
@ -381,5 +381,5 @@ class RouterDriverTest(base.RugTestBase):
rtr = self._init_driver()
self.ctx.neutron.get_router_detail.side_effect = [neutron.RouterGone]
rtr._ensure_cache(self.ctx)
self.assertEqual(rtr._router, None)
self.assertIsNone(rtr._router)
self.ctx.neutron.get_router_detail.assert_called_with(rtr.id)