From: Waldemar Kozaczuk <[email protected]> Committer: Waldemar Kozaczuk <[email protected]> Branch: master
scripts: fix trace.py Newer versions of tcpdump uses by trace.py emit slightly longer text "reading from file -, link-type EN10MB (Ethernet)" and make the tst-tracing fail. This patch make trace.py only check that the line begins with that expected text. Signed-off-by: Waldemar Kozaczuk <[email protected]> --- diff --git a/scripts/trace.py b/scripts/trace.py --- a/scripts/trace.py +++ b/scripts/trace.py @@ -346,7 +346,7 @@ def format_packet_sample(sample): pcap = dpkt.pcap.Writer(proc.stdin) write_sample_to_pcap(sample, pcap) pcap.close() - assert(proc.stdout.readline().decode() == "reading from file -, link-type EN10MB (Ethernet)\n") + assert(proc.stdout.readline().decode().startswith("reading from file -, link-type EN10MB (Ethernet)")) packet_line = proc.stdout.readline().rstrip() proc.wait() return packet_line -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/000000000000099ca205c363b210%40google.com.
