Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: TCP state tracking based on RFC 7857/RFC 6146
[vpp.git]
/
test
/
framework.py
diff --git
a/test/framework.py
b/test/framework.py
index
f4b168b
..
8c0df28
100644
(file)
--- a/
test/framework.py
+++ b/
test/framework.py
@@
-26,7
+26,7
@@
from abc import ABC, abstractmethod
from struct import pack, unpack
import scapy.compat
from struct import pack, unpack
import scapy.compat
-from scapy.packet import Raw
+from scapy.packet import Raw
, Packet
import hook as hookmodule
from vpp_pg_interface import VppPGInterface
from vpp_sub_interface import VppSubInterface
import hook as hookmodule
from vpp_pg_interface import VppPGInterface
from vpp_sub_interface import VppSubInterface
@@
-1308,7
+1308,7
@@
class VppTestCase(CPUInterface, unittest.TestCase):
def send_and_expect(self, intf, pkts, output, n_rx=None, worker=None,
trace=True):
if not n_rx:
def send_and_expect(self, intf, pkts, output, n_rx=None, worker=None,
trace=True):
if not n_rx:
- n_rx = len(pkts)
+ n_rx =
1 if isinstance(pkts, Packet) else
len(pkts)
self.pg_send(intf, pkts, worker=worker, trace=trace)
rx = output.get_capture(n_rx)
if trace:
self.pg_send(intf, pkts, worker=worker, trace=trace)
rx = output.get_capture(n_rx)
if trace: