diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2020-12-03 00:42:46 -0500 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2020-12-03 19:43:23 +0000 |
| commit | 090096bff365b4ad69c061303c0852bf214b4f03 (patch) | |
| tree | 04ce3aa4df1f81d37acdf398dc0ef4ee3f245cd4 /test/test_reassembly.py | |
| parent | 4a856f9593fb36fe7fdd2d6bcf79d9a7fada36ef (diff) | |
tests: remove py2/py3 six compatability library
Type: test
Change-Id: Idb6b8169845e0239e639429ccfd02a683212b7e6
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_reassembly.py')
| -rw-r--r-- | test/test_reassembly.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/test_reassembly.py b/test/test_reassembly.py index cb6b8ff5d3f..797fb527415 100644 --- a/test/test_reassembly.py +++ b/test/test_reassembly.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import six import unittest from random import shuffle, choice, randrange @@ -95,7 +94,7 @@ class TestIPv4Reassembly(VppTestCase): def create_fragments(cls): infos = cls._packet_infos cls.pkt_infos = [] - for index, info in six.iteritems(infos): + for index, info in infos.items(): p = info.data # cls.logger.debug(ppp("Packet:", # p.__class__(scapy.compat.raw(p)))) @@ -811,7 +810,7 @@ class TestIPv4MWReassembly(VppTestCase): def create_fragments(cls): infos = cls._packet_infos cls.pkt_infos = [] - for index, info in six.iteritems(infos): + for index, info in infos.items(): p = info.data # cls.logger.debug(ppp("Packet:", # p.__class__(scapy.compat.raw(p)))) @@ -986,7 +985,7 @@ class TestIPv6Reassembly(VppTestCase): def create_fragments(cls): infos = cls._packet_infos cls.pkt_infos = [] - for index, info in six.iteritems(infos): + for index, info in infos.items(): p = info.data # cls.logger.debug(ppp("Packet:", # p.__class__(scapy.compat.raw(p)))) @@ -1444,7 +1443,7 @@ class TestIPv6MWReassembly(VppTestCase): def create_fragments(cls): infos = cls._packet_infos cls.pkt_infos = [] - for index, info in six.iteritems(infos): + for index, info in infos.items(): p = info.data # cls.logger.debug(ppp("Packet:", # p.__class__(scapy.compat.raw(p)))) @@ -1782,7 +1781,7 @@ class TestIPv4ReassemblyLocalNode(VppTestCase): def create_fragments(cls): infos = cls._packet_infos cls.pkt_infos = [] - for index, info in six.iteritems(infos): + for index, info in infos.items(): p = info.data # cls.logger.debug(ppp("Packet:", # p.__class__(scapy.compat.raw(p)))) @@ -1973,7 +1972,7 @@ class TestFIFReassembly(VppTestCase): self.extend_packet(p, size, self.padding) info.data = p[IP] # use only IP part, without ethernet header - fragments = [x for _, p in six.iteritems(self._packet_infos) + fragments = [x for _, p in self._packet_infos.items() for x in fragment_rfc791(p.data, 400)] encapped_fragments = \ @@ -2038,7 +2037,7 @@ class TestFIFReassembly(VppTestCase): self.extend_packet(p, size, self.padding) info.data = p[IPv6] # use only IPv6 part, without ethernet header - fragments = [x for _, i in six.iteritems(self._packet_infos) + fragments = [x for _, i in self._packet_infos.items() for x in fragment_rfc8200( i.data, i.index, 400)] |