VPP-1508: Fix zip() under python3. 81/17981/4
authorPaul Vinciguerra <pvinci@vinciconsulting.com>
Sat, 2 Mar 2019 18:43:05 +0000 (10:43 -0800)
committerDave Wallace <dwallacelf@gmail.com>
Wed, 8 May 2019 01:33:45 +0000 (01:33 +0000)
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>
test/test_reassembly.py

index 07d5737..f57c14c 100644 (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