openstack
/
networking-l2gw
Code Issues Proposed changes

Fix the order of arguments in assertEqual

Browse Source 
Some tests used incorrect order assertEqual(observed, expected).

The correct order expected by testtools is
assertEqual(expected, observed).

Co-Authored-By: yan.songming@zte.com.cn

Change-Id: I29020058671348e0734906a71ac3ae0798172a23
Partial-Bug: #1259292
changes/46/338646/7
qinchunhua 7 years ago
parent 459c11e3d5
commit f9f0350577
4 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

10
networking_l2gw/tests/unit/services/l2gateway/agent/ovsdb/test_base_connection.py
Unescape View File

@ -200,13 +200,13 @@ class TestBaseConnection_with_enable_manager(base.BaseTestCase):
with mock.patch.object(eventlet.greenthread,
'spawn') as (mock_thread):
self.l2gw_ovsdb_conn.__init__(mock.Mock(), self.conf)
self.assertEqual(self.l2gw_ovsdb_conn.s, mock.ANY)
self.assertEqual(mock.ANY, self.l2gw_ovsdb_conn.s)
self.assertFalse(self.l2gw_ovsdb_conn.check_sock_rcv)
self.assertIsNone(self.l2gw_ovsdb_conn.check_c_sock)
self.assertEqual(self.l2gw_ovsdb_conn.ovsdb_dicts, fake_dict)
self.assertEqual(self.l2gw_ovsdb_conn.ovsdb_fd_states, fake_dict)
self.assertEqual(self.l2gw_ovsdb_conn.manager_table_listening_port,
6632)
self.assertEqual(fake_dict, self.l2gw_ovsdb_conn.ovsdb_dicts)
self.assertEqual(fake_dict, self.l2gw_ovsdb_conn.ovsdb_fd_states)
self.assertEqual(6632,
self.l2gw_ovsdb_conn.manager_table_listening_port)
self.assertTrue(mock_thread.called)
def test_send_monitor_msg_to_ovsdb_connection(self):

4
networking_l2gw/tests/unit/services/l2gateway/agent/test_base_agent_manager.py
Unescape View File

@ -45,8 +45,8 @@ class TestBaseAgentManager(base.BaseTestCase):
with mock.patch.object(l2gw_manager.BaseAgentManager,
'_setup_state_rpc') as setup_state_rpc:
self.l2gw_agent_manager.__init__(mock.Mock())
self.assertEqual(self.l2gw_agent_manager.l2gw_agent_type,
'')
self.assertEqual('',
self.l2gw_agent_manager.l2gw_agent_type)
self.assertTrue(self.l2gw_agent_manager.admin_state_up)
self.assertTrue(setup_state_rpc.called)
self.assertTrue(l2_gw_agent_api.called)

68
networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py
Unescape View File

@ -79,8 +79,8 @@ class TestOVSDBData(base.BaseTestCase):
with mock.patch.object(data.OVSDBData,
'_setup_entry_table') as setup_entry_table:
self.ovsdb_data.__init__(self.ovsdb_identifier)
self.assertEqual(self.ovsdb_data.ovsdb_identifier,
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
self.ovsdb_data.ovsdb_identifier)
self.assertTrue(setup_entry_table.called)
def test_update_ovsdb_changes(self):
@ -270,8 +270,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_new_logical_switches(
self.context, fake_new_logical_switches)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
get_ls.assert_called_with(self.context, fake_dict)
add_ls.assert_called_with(self.context, fake_dict)
@ -286,8 +286,8 @@ class TestOVSDBData(base.BaseTestCase):
self.context, fake_new_physical_switches)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertIsNone(fake_dict['tunnel_ip'])
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
get_ps.assert_called_with(self.context, fake_dict)
add_ps.assert_called_with(self.context, fake_dict)
@ -308,8 +308,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_new_physical_ports(
self.context, fake_new_physical_ports)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict2)
self.assertEqual(fake_dict2[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict2[n_const.OVSDB_IDENTIFIER])
get_pp.assert_called_with(self.context, fake_dict2)
add_pp.assert_called_with(self.context, fake_dict2)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict1)
@ -327,8 +327,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_new_physical_locators(
self.context, fake_new_physical_locators)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
get_pl.assert_called_with(self.context, fake_dict)
add_pl.assert_called_with(self.context, fake_dict)
@ -345,8 +345,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_new_local_macs(
self.context, fake_new_local_macs)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
get_lm.assert_called_with(self.context, fake_dict)
add_lm.assert_called_with(self.context, fake_dict)
@ -360,8 +360,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_new_remote_macs(
self.context, fake_new_remote_macs)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
get_mr.assert_called_with(self.context, fake_dict)
add_mr.assert_called_with(self.context, fake_dict)
@ -373,8 +373,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_modified_remote_macs(
self.context, fake_modified_remote_macs)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
update_mr.assert_called_with(self.context, fake_dict)
def test_process_deleted_logical_switches(self):
@ -384,8 +384,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_logical_switches(
self.context, fake_deleted_logical_switches)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
delete_ls.assert_called_with(self.context, fake_dict)
def test_get_agent_by_mac(self):
@ -430,8 +430,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_physical_switches(
self.context, fake_deleted_physical_switches)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
delete_ps.assert_called_with(self.context, fake_dict)
get_ps.assert_called_with(self.context, 'fake_ovsdb_id')
get_ls.assert_called_with(self.context, 'fake_ovsdb_id')
@ -470,8 +470,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_physical_ports(
self.context, fake_deleted_physical_ports)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
l2gw_conn_del.assert_called_with(self.context, 'fake_uuid')
delete_pp.assert_called_with(self.context, fake_dict)
@ -519,8 +519,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_physical_ports(
self.context, fake_deleted_physical_ports)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
l2gw_conn_del.assert_called_with(self.context, 'fake_uuid')
get_vlan_by_pp.assert_called_with(self.context, fake_dict)
del_vlan.assert_called_with(self.context, vlan_binding_dict)
@ -562,8 +562,8 @@ class TestOVSDBData(base.BaseTestCase):
self.assertTrue(get_ls.called)
self.assertTrue(get_all_ps.called)
self.assertTrue(get_fdb.called)
self.assertEqual(fake_dict1[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict1[n_const.OVSDB_IDENTIFIER])
delete_pl.assert_called_with(self.context, fake_dict1)
self.assertTrue(get_agent_ips.called)
trig_l2pop.assert_called_with(self.context,
@ -601,8 +601,8 @@ class TestOVSDBData(base.BaseTestCase):
self.assertTrue(get_ls.called)
self.assertTrue(get_all_ps.called)
self.assertTrue(get_fdb.called)
self.assertEqual(fake_dict1[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict1[n_const.OVSDB_IDENTIFIER])
delete_pl.assert_called_once_with(self.context, fake_dict1)
self.assertTrue(get_agent_ips.called)
trig_l2pop.assert_called_with(self.context,
@ -621,8 +621,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_local_macs(
self.context, fake_deleted_local_macs)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
delete_ml.assert_called_with(self.context, fake_dict)
def test_process_deleted_remote_macs(self):
@ -632,8 +632,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_deleted_remote_macs(
self.context, fake_deleted_remote_macs)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict)
self.assertEqual(fake_dict[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict[n_const.OVSDB_IDENTIFIER])
delete_mr.assert_called_with(self.context, fake_dict)
def test_process_modified_physical_ports(self):
@ -656,8 +656,8 @@ class TestOVSDBData(base.BaseTestCase):
self.ovsdb_data._process_modified_physical_ports(
self.context, fake_modified_physical_ports)
self.assertIn(n_const.OVSDB_IDENTIFIER, fake_dict2)
self.assertEqual(fake_dict2[n_const.OVSDB_IDENTIFIER],
'fake_ovsdb_id')
self.assertEqual('fake_ovsdb_id',
fake_dict2[n_const.OVSDB_IDENTIFIER])
get_pp.assert_called_with(self.context, fake_dict2)
update_pp_status.assert_called_with(self.context, fake_dict2)
self.assertFalse(add_pp.called)

16
networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py
Unescape View File

@ -256,7 +256,7 @@ class TestL2gwRpcDriver(base.BaseTestCase):
self.context, fake_method, 100L, fake_interface,
fake_pp_dict, 'fake_uuid', fake_connection)
get_vlan.assert_called_with(self.context, fake_pp_dict)
self.assertEqual(port, phys_port_dict)
self.assertEqual(phys_port_dict, port)
def test_get_ip_details(self):
fake_port = {'binding:host_id': 'fake_host',
@ -268,8 +268,8 @@ class TestL2gwRpcDriver(base.BaseTestCase):
(ret_dst_ip, ret_ip_add) = self.plugin._get_ip_details(
self.context, fake_port)
get_agent.assert_called_with(self.context, 'fake_host')
self.assertEqual(ret_dst_ip, 'fake_tun_ip')
self.assertEqual(ret_ip_add, 'fake_ip')
self.assertEqual('fake_tun_ip', ret_dst_ip)
self.assertEqual('fake_ip', ret_ip_add)
def test_get_agent_details_for_no_ovs_agent(self):
core_plugin = mock.PropertyMock()
@ -332,8 +332,8 @@ class TestL2gwRpcDriver(base.BaseTestCase):
ret_ls_dict_without_ls = self.plugin._get_logical_switch_dict(
self.context, fake_ls, fake_connection)
get_network.assert_called_with(self.context, 'fake_network_id')
self.assertEqual(ret_ls_dict, fake_ls_dict)
self.assertEqual(ret_ls_dict_without_ls, fake_ls_dict_without_ls)
self.assertEqual(fake_ls_dict, ret_ls_dict)
self.assertEqual(fake_ls_dict_without_ls, ret_ls_dict_without_ls)
def test_get_logical_switch_dict_for_multi_segment_network(self):
fake_logical_switch = {'uuid': 'fake_uuid',
@ -436,7 +436,7 @@ class TestL2gwRpcDriver(base.BaseTestCase):
fake_locator_dict)
get_pl_dict.assert_called_with(fake_dst_ip,
'fake_uuid', fake_mac_list)
self.assertEqual(ret_pl_list, fale_pl_list)
self.assertEqual(fale_pl_list, ret_pl_list)
def test_get_identifer_list(self):
fake_connection = {'l2_gateway_id': 'fake_l2gw_id',
@ -462,7 +462,7 @@ class TestL2gwRpcDriver(base.BaseTestCase):
assert_called_with(mock.ANY, mock.ANY))
db.get_physical_switch_by_name.assert_called_with(
self.context, 'fake_device_name')
self.assertEqual(ret_value, fake_identifier_set)
self.assertEqual(fake_identifier_set, ret_value)
def test_get_set_of_ovsdb_ids(self):
fake_connection = {'id': 'fake_id',
@ -479,7 +479,7 @@ class TestL2gwRpcDriver(base.BaseTestCase):
fake_gw_conn_ovsdb_set)
self.service_plugin.get_l2_gateway_connections.assert_called_with(
mock.ANY, filters=mock.ANY)
self.assertEqual(ret_value, fake_gw_conn_ovsdb_set)
self.assertEqual(fake_gw_conn_ovsdb_set, ret_value)
def test_remove_vm_macs(self):
fake_network_id = 'fake_network_id'

Write Preview
Loading…
Cancel
Save