openstack
/
neutron
Code Issues Proposed changes

Merge "[Functional tests] Change way how conntrack entries are checked" into stable/queens

This commit is contained in:
Zuul 2019-04-05 20:56:31 +00:00 committed by Gerrit Code Review
parent 46737765a1 19912a30bd
commit 5995b09d47
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/functional/agent/linux/test_netlink_lib.py
View File

@ -55,7 +55,10 @@ class NetlinkLibTestCase(functional_base.BaseSudoTestCase):
def _delete_entry(self, delete_entries, remain_entries, zone):
nl_lib.delete_entries(entries=delete_entries)
entries_list = nl_lib.list_entries(zone=zone)
self.assertEqual(remain_entries, entries_list)
for delete_entry in delete_entries:
self.assertNotIn(delete_entry, entries_list)
for remain_entry in remain_entries:
self.assertIn(remain_entry, entries_list)
@staticmethod
def _find_unused_zone_id(start, end):
@ -83,7 +86,8 @@ class NetlinkLibTestCase(functional_base.BaseSudoTestCase):
(4, 'udp', 4, 5, '1.1.1.1', '2.2.2.2', _zone)
)
entries_list = nl_lib.list_entries(zone=_zone)
self.assertEqual(expected, entries_list)
for entry in expected:
self.assertIn(entry, entries_list)
def test_delete_icmp_entry(self):
_zone = self._find_unused_zone_id(31, 50)