diff options
| author | Flavio Fernandes <flaviof@redhat.com> | 2020-09-10 11:56:44 -0400 |
|---|---|---|
| committer | Flavio Fernandes <flavio@flaviof.com> | 2020-09-15 19:31:27 +0000 |
| commit | 4b89e87959d4c2ca9fc02b415adc2ddea4d50f65 (patch) | |
| tree | 010f002d7936efaa7dca9ace12248e860fcf5f2f /neutron | |
| parent | a1d89e6f0eb27400984bf3e4f37704147f592a9d (diff) | |
| download | neutron-4b89e87959d4c2ca9fc02b415adc2ddea4d50f65.tar.gz | |
[ovn]: Use assertCountEqual instead of assertEqual when appropriate
Fix unit test for ovn port forwarding to:
- Use assertCountEqual to ignore the order of the content when it should;
- Fix (expected, actual) parameters in assertEqual
TrivialFix
Change-Id: I0bbea25861b078a0da8b8feaa4a6251527cc5979
Signed-off-by: Flavio Fernandes <flaviof@redhat.com>
Diffstat (limited to 'neutron')
| -rw-r--r-- | neutron/tests/unit/services/portforwarding/drivers/ovn/test_driver.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/neutron/tests/unit/services/portforwarding/drivers/ovn/test_driver.py b/neutron/tests/unit/services/portforwarding/drivers/ovn/test_driver.py index 014ba96f7a..e57895e48f 100644 --- a/neutron/tests/unit/services/portforwarding/drivers/ovn/test_driver.py +++ b/neutron/tests/unit/services/portforwarding/drivers/ovn/test_driver.py @@ -86,16 +86,16 @@ class TestOVNPortForwardingHandler(TestOVNPortForwardingBase): def test_lb_names(self): expected_names = ['pf-floatingip-id-udp', 'pf-floatingip-id-tcp'] names = self.handler.lb_names('id') - self.assertEqual(names, expected_names) + self.assertCountEqual(expected_names, names) def test_get_lb_attributes(self): fake_pf_obj = self._fake_pf_obj() lb_name, vip, internal_ip, rtr_name = self.handler._get_lb_attributes( fake_pf_obj) - self.assertEqual(lb_name, 'pf-floatingip-fip_id-udp') - self.assertEqual(vip, 'fip_addr:ext_port') - self.assertEqual(internal_ip, ['internal_addr:internal_port']) - self.assertEqual(rtr_name, 'neutron-rtr_id') + self.assertEqual('pf-floatingip-fip_id-udp', lb_name) + self.assertEqual('fip_addr:ext_port', vip) + self.assertCountEqual(['internal_addr:internal_port'], internal_ip) + self.assertEqual('neutron-rtr_id', rtr_name) @mock.patch.object(port_forwarding.LOG, 'info') def test_port_forwarding_created(self, m_info): @@ -211,15 +211,15 @@ class TestOVNPortForwarding(TestOVNPortForwardingBase): self.pf_plugin.get_floatingip_port_forwardings.assert_called_once_with( self.context, fip_id) for index, fake_pf_dict in enumerate(fake_pf_dicts): - self.assertEqual(pf_objs[index].id, fake_pf_dict['id']) - self.assertEqual(pf_objs[index].floatingip_id, - fake_pf_dict['floatingip_id']) - self.assertEqual(pf_objs[index].external_port, - fake_pf_dict['external_port']) - self.assertEqual(pf_objs[index].internal_port_id, - fake_pf_dict['internal_port_id']) - self.assertEqual(pf_objs[index].router_id, - fake_pf_dict['router_id']) + self.assertEqual(fake_pf_dict['id'], pf_objs[index].id) + self.assertEqual(fake_pf_dict['floatingip_id'], + pf_objs[index].floatingip_id) + self.assertEqual(fake_pf_dict['external_port'], + pf_objs[index].external_port) + self.assertEqual(fake_pf_dict['internal_port_id'], + pf_objs[index].internal_port_id) + self.assertEqual(fake_pf_dict['router_id'], + pf_objs[index].router_id) def test_get_fip_objs(self): pf_payload = [self._fake_pf_payload_entry(1), @@ -228,7 +228,7 @@ class TestOVNPortForwarding(TestOVNPortForwardingBase): self._fake_pf_payload_entry(1, 3)] self.l3_plugin.get_floatingip = lambda _, fip_id: fip_id * 10 fip_objs = self._ovn_pf._get_fip_objs(self.context, pf_payload) - self.assertEqual(fip_objs, {3: 30, 2: 20, 1: 10}) + self.assertEqual({3: 30, 2: 20, 1: 10}, fip_objs) def _handle_notification_common(self, event_type, payload=None, fip_objs=None): |