x/vmware-nsx
Code Issues Proposed changes

Fix incorrect usage of assertTrue()

Browse Source 
The usage of assertTrue() is incorrect, more explicit assert
from the unit test suite(like assertIsNotNone or assertIn)
should be used instead.

Fixes: bug #1217028
Change-Id: I30a80bc9e122d28c22b698e0cb97068c1040bfc3
Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>
This commit is contained in:
Rosario Di Somma 2013-08-27 09:25:59 -04:00
parent 6ae42583eb
commit 811a23275d
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/test_l3_agent.py
View File

@ -511,25 +511,25 @@ class TestBasicRouterOperations(base.BaseTestCase):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent.router_deleted(None, FAKE_ID) agent.router_deleted(None, FAKE_ID)
# verify that will set fullsync # verify that will set fullsync
self.assertTrue(FAKE_ID in agent.removed_routers) self.assertIn(FAKE_ID, agent.removed_routers)
def test_routers_updated(self): def test_routers_updated(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent.routers_updated(None, [FAKE_ID]) agent.routers_updated(None, [FAKE_ID])
# verify that will set fullsync # verify that will set fullsync
self.assertTrue(FAKE_ID in agent.updated_routers) self.assertIn(FAKE_ID, agent.updated_routers)
def test_removed_from_agent(self): def test_removed_from_agent(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent.router_removed_from_agent(None, {'router_id': FAKE_ID}) agent.router_removed_from_agent(None, {'router_id': FAKE_ID})
# verify that will set fullsync # verify that will set fullsync
self.assertTrue(FAKE_ID in agent.removed_routers) self.assertIn(FAKE_ID, agent.removed_routers)
def test_added_to_agent(self): def test_added_to_agent(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent.router_added_to_agent(None, [FAKE_ID]) agent.router_added_to_agent(None, [FAKE_ID])
# verify that will set fullsync # verify that will set fullsync
self.assertTrue(FAKE_ID in agent.updated_routers) self.assertIn(FAKE_ID, agent.updated_routers)
def test_process_router_delete(self): def test_process_router_delete(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)

31
neutron/tests/unit/test_l3_plugin.py
View File

@ -141,7 +141,7 @@ class L3NatExtensionTestCase(testlib_api.WebTestCase):
router=data) router=data)
self.assertEqual(res.status_int, exc.HTTPCreated.code) self.assertEqual(res.status_int, exc.HTTPCreated.code)
res = self.deserialize(res) res = self.deserialize(res)
self.assertTrue('router' in res) self.assertIn('router', res)
router = res['router'] router = res['router']
self.assertEqual(router['id'], router_id) self.assertEqual(router['id'], router_id)
self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['status'], "ACTIVE")
@ -165,7 +165,7 @@ class L3NatExtensionTestCase(testlib_api.WebTestCase):
page_reverse=mock.ANY) page_reverse=mock.ANY)
self.assertEqual(res.status_int, exc.HTTPOk.code) self.assertEqual(res.status_int, exc.HTTPOk.code)
res = self.deserialize(res) res = self.deserialize(res)
self.assertTrue('routers' in res) self.assertIn('routers', res)
self.assertEqual(1, len(res['routers'])) self.assertEqual(1, len(res['routers']))
self.assertEqual(router_id, res['routers'][0]['id']) self.assertEqual(router_id, res['routers'][0]['id'])
@ -187,7 +187,7 @@ class L3NatExtensionTestCase(testlib_api.WebTestCase):
router=update_data) router=update_data)
self.assertEqual(res.status_int, exc.HTTPOk.code) self.assertEqual(res.status_int, exc.HTTPOk.code)
res = self.deserialize(res) res = self.deserialize(res)
self.assertTrue('router' in res) self.assertIn('router', res)
router = res['router'] router = res['router']
self.assertEqual(router['id'], router_id) self.assertEqual(router['id'], router_id)
self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['status'], "ACTIVE")
@ -209,7 +209,7 @@ class L3NatExtensionTestCase(testlib_api.WebTestCase):
fields=mock.ANY) fields=mock.ANY)
self.assertEqual(res.status_int, exc.HTTPOk.code) self.assertEqual(res.status_int, exc.HTTPOk.code)
res = self.deserialize(res) res = self.deserialize(res)
self.assertTrue('router' in res) self.assertIn('router', res)
router = res['router'] router = res['router']
self.assertEqual(router['id'], router_id) self.assertEqual(router['id'], router_id)
self.assertEqual(router['status'], "ACTIVE") self.assertEqual(router['status'], "ACTIVE")
@ -245,7 +245,7 @@ class L3NatExtensionTestCase(testlib_api.WebTestCase):
interface_data) interface_data)
self.assertEqual(res.status_int, exc.HTTPOk.code) self.assertEqual(res.status_int, exc.HTTPOk.code)
res = self.deserialize(res) res = self.deserialize(res)
self.assertTrue('port_id' in res) self.assertIn('port_id', res)
self.assertEqual(res['port_id'], port_id) self.assertEqual(res['port_id'], port_id)
self.assertEqual(res['subnet_id'], subnet_id) self.assertEqual(res['subnet_id'], subnet_id)
@ -643,7 +643,7 @@ class L3NatDBTestCase(L3NatTestCaseBase):
r['router']['id'], r['router']['id'],
s['subnet']['id'], s['subnet']['id'],
None) None)
self.assertTrue('port_id' in body) self.assertIn('port_id', body)
# fetch port and confirm device_id # fetch port and confirm device_id
r_port_id = body['port_id'] r_port_id = body['port_id']
@ -670,8 +670,7 @@ class L3NatDBTestCase(L3NatTestCaseBase):
stid = s['subnet']['tenant_id'] stid = s['subnet']['tenant_id']
# tolerate subnet tenant deliberately to '' in the # tolerate subnet tenant deliberately to '' in the
# nicira metadata access case # nicira metadata access case
self.assertTrue(payload['tenant_id'] == stid or self.assertIn(payload['tenant_id'], [stid, ''])
payload['tenant_id'] == '')
def test_router_add_interface_subnet_with_bad_tenant_returns_404(self): def test_router_add_interface_subnet_with_bad_tenant_returns_404(self):
with mock.patch('neutron.context.Context.to_dict') as tdict: with mock.patch('neutron.context.Context.to_dict') as tdict:
@ -695,7 +694,7 @@ class L3NatDBTestCase(L3NatTestCaseBase):
r['router']['id'], r['router']['id'],
s['subnet']['id'], s['subnet']['id'],
None) None)
self.assertTrue('port_id' in body) self.assertIn('port_id', body)
tdict.return_value = tenant_context tdict.return_value = tenant_context
self._router_interface_action('remove', self._router_interface_action('remove',
r['router']['id'], r['router']['id'],
@ -728,14 +727,14 @@ class L3NatDBTestCase(L3NatTestCaseBase):
r['router']['id'], r['router']['id'],
s2['subnet']['id'], s2['subnet']['id'],
None) None)
self.assertTrue('port_id' in body) self.assertIn('port_id', body)
ctx.return_value = tenant_context ctx.return_value = tenant_context
self._router_interface_action( self._router_interface_action(
'add', 'add',
r['router']['id'], r['router']['id'],
s1['subnet']['id'], s1['subnet']['id'],
None) None)
self.assertTrue('port_id' in body) self.assertIn('port_id', body)
self._router_interface_action( self._router_interface_action(
'remove', 'remove',
r['router']['id'], r['router']['id'],
@ -755,7 +754,7 @@ class L3NatDBTestCase(L3NatTestCaseBase):
r['router']['id'], r['router']['id'],
None, None,
p['port']['id']) p['port']['id'])
self.assertTrue('port_id' in body) self.assertIn('port_id', body)
self.assertEqual(body['port_id'], p['port']['id']) self.assertEqual(body['port_id'], p['port']['id'])
# fetch port and confirm device_id # fetch port and confirm device_id
@ -1245,8 +1244,8 @@ class L3NatDBTestCase(L3NatTestCaseBase):
fip['floatingip']['id']) fip['floatingip']['id'])
self.assertEqual(body['floatingip']['port_id'], self.assertEqual(body['floatingip']['port_id'],
fip['floatingip']['port_id']) fip['floatingip']['port_id'])
self.assertTrue(body['floatingip']['fixed_ip_address'] is not None) self.assertIsNotNone(body['floatingip']['fixed_ip_address'])
self.assertTrue(body['floatingip']['router_id'] is not None) self.assertIsNotNone(body['floatingip']['router_id'])
def test_floatingip_port_delete(self): def test_floatingip_port_delete(self):
with self.subnet() as private_sub: with self.subnet() as private_sub:
@ -1668,8 +1667,8 @@ class L3AgentDbTestCase(L3NatTestCaseBase):
fip['floatingip']['id']) fip['floatingip']['id'])
self.assertEqual(floatingips[0]['port_id'], self.assertEqual(floatingips[0]['port_id'],
fip['floatingip']['port_id']) fip['floatingip']['port_id'])
self.assertTrue(floatingips[0]['fixed_ip_address'] is not None) self.assertIsNotNone(floatingips[0]['fixed_ip_address'])
self.assertTrue(floatingips[0]['router_id'] is not None) self.assertIsNotNone(floatingips[0]['router_id'])
def _test_notify_op_agent(self, target_func, *args): def _test_notify_op_agent(self, target_func, *args):
l3_rpc_agent_api_str = ( l3_rpc_agent_api_str = (