test framework. Remove unused code. 21/16721/3
authorPaul Vinciguerra <pvinci@vinciconsulting.com>
Tue, 8 Jan 2019 00:29:26 +0000 (16:29 -0800)
committerNeale Ranns <nranns@cisco.com>
Wed, 9 Jan 2019 06:10:59 +0000 (06:10 +0000)
Change-Id: I1bd14d5aff4918b58aef18fa0a9264e033989f6e
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
test/framework.py

index 7633ca0..604e342 100644 (file)
@@ -977,12 +977,7 @@ class VppTestCase(unittest.TestCase):
         input.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-        if isinstance(object, (list,)):
-            rx = []
-            for o in output:
-                rx.append(output.get_capture(len(pkts)))
-        else:
-            rx = output.get_capture(len(pkts))
+        rx = output.get_capture(len(pkts))
         return rx
 
     def send_and_expect_only(self, input, pkts, output, timeout=None):
@@ -990,14 +985,8 @@ class VppTestCase(unittest.TestCase):
         input.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-        if isinstance(object, (list,)):
-            outputs = output
-            rx = []
-            for o in outputs:
-                rx.append(output.get_capture(len(pkts)))
-        else:
-            rx = output.get_capture(len(pkts))
-            outputs = [output]
+        rx = output.get_capture(len(pkts))
+        outputs = [output]
         if not timeout:
             timeout = 1
         for i in self.pg_interfaces: