From: Paul Vinciguerra Date: Sat, 2 Mar 2019 18:43:05 +0000 (-0800) Subject: VPP-1508: Fix zip() under python3. X-Git-Tag: v20.01-rc0~660 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F17981%2F4;p=vpp.git 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 --- 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