ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPP-1508: Fix zip() under python3.

Browse Source 
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>
This commit is contained in:
Paul Vinciguerra
2019-03-02 10:43:05 -08:00
committed by Dave Wallace
parent a483d81dab
commit c7834e0564
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_reassembly.py
View File

@ -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