[ovs-dev] [PATCH] tests: Tolerate different versions of tcpdump.

[Justin Pettit]

Thank you!

I assume you're fine not matching the IP addresses and such, since the tcpdump output should be fine if its processed that much, and we're really testing the ability to spit out an appropriate OFPT_PACKET_IN?  If so, looks good.

--Justin


On Jan 27, 2011, at 9:50 AM, Ben Pfaff wrote:

> The tcpdump output format differs slightly from one version to another, so
> this test that runs tcpdump would fail depending on the system it was run
> on.  This commit fixes the problem by using "sed" to trim off the part of
> the line that can differ.
> 
> Reported-by: Justin Pettit <jpettit at nicira.com>
> ---
> tests/ofp-print.at |    7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/ofp-print.at b/tests/ofp-print.at
> index b20bdc9..5b3c849 100644
> --- a/tests/ofp-print.at
> +++ b/tests/ofp-print.at
> @@ -224,10 +224,13 @@ AT_CHECK([ovs-ofctl ofp-print "\
> 45 00 00 28 bd 12 00 00 40 06 3c 6a c0 a8 00 01 \
> c0 a8 00 02 27 2f 00 00 78 50 cc 5b 57 af 42 1e \
> 50 00 02 00 26 e8 00 00 00 00 00 00 00 00 \
> -"], [0], [dnl
> +"], [0], [stdout])
> +dnl The tcpdump output format differs slightly from one version to another,
> +dnl so trim off the end of the line where differences appear.
> +AT_CHECK([sed 's/\(length 60:\).*/\1 .../' stdout], [0], [dnl
> OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=3 data_len=60 buffer=0x00000111
> tunnel0:in_port0003:tci(0) mac50:54:00:00:00:05->50:54:00:00:00:06 type0800 proto6 tos0 ip192.168.0.1->192.168.0.2 port10031->0
> --8:00:00.000000 50:54:00:00:00:05 > 50:54:00:00:00:06, ethertype IPv4 (0x0800), length 60: 192.168.0.1.10031 > 192.168.0.2.0: . win 512
> +-8:00:00.000000 50:54:00:00:00:05 > 50:54:00:00:00:06, ethertype IPv4 (0x0800), length 60: ...
> ])
> AT_CLEANUP
> 
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org