diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-03-02 10:43:05 -0800 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2019-05-08 01:33:45 +0000 |
| commit | c7834e05646a1a5a8c1f063bd08ca3b0cb36b602 (patch) | |
| tree | 9763a85c1856fb0b29b80c9b818ec9529796f3a7 | |
| parent | a483d81dab7c973965812e635fa5aa1dee8fb213 (diff) | |
VPP-1508: Fix zip() under python3.
Under py3, zip() returns an iterator. Fix so no longer needed in a list contex.
Change-Id: I64b4560d990686cc87fd26d703030f9fb2494f12
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
| -rw-r--r-- | test/test_reassembly.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_reassembly.py b/test/test_reassembly.py index 07d5737ffac..f57c14c1cf5 100644 --- a/test/test_reassembly.py +++ b/test/test_reassembly.py @@ -450,10 +450,10 @@ class TestIPv4Reassembly(TestIPReassemblyMixin, VppTestCase): # new reassemblies will be started and packet generator will # freak out when it detects unfreed buffers zipped = zip(frags_300, frags_200) - for i, j in zipped[:-1]: + for i, j in zipped: fragments.extend(i) fragments.extend(j) - fragments.append(zipped[-1][0]) + fragments.pop() self.pg_enable_capture() self.src_if.add_stream(fragments) @@ -685,10 +685,10 @@ class TestIPv6Reassembly(TestIPReassemblyMixin, VppTestCase): # new reassemblies will be started and packet generator will # freak out when it detects unfreed buffers zipped = zip(frags_400, frags_300) - for i, j in zipped[:-1]: + for i, j in zipped: fragments.extend(i) fragments.extend(j) - fragments.append(zipped[-1][0]) + fragments.pop() dropped_packet_indexes = set( index for (index, _, frags) in self.pkt_infos if len(frags) > 1 |