diff options
author | Jesse Gross <jesse@kernel.org> | 2016-08-18 11:55:11 -0700 |
---|---|---|
committer | Jesse Gross <jesse@kernel.org> | 2016-08-18 16:42:33 -0700 |
commit | f5ca7ec22c3cde403c958b140341b0997032e4d9 (patch) | |
tree | 5dce7bb2a893e143235fc70c358f7ab3d929ef70 /tests/tunnel-push-pop.at | |
parent | 2a94b57160bfda85d3af8845265826e9a67301b0 (diff) | |
download | openvswitch-f5ca7ec22c3cde403c958b140341b0997032e4d9.tar.gz |
tests: Avoid race in tunnel-push-pop tests.
These tests dump the flows currently in the datapath but they aren't
the first to run and might have existing flows left over. We don't
really care if there are others flows present so filter on the ones
we want to avoid being affected by the timing of flow eviction.
Signed-off-by: Jesse Gross <jesse@kernel.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Diffstat (limited to 'tests/tunnel-push-pop.at')
-rw-r--r-- | tests/tunnel-push-pop.at | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index ee2959407..8245bf137 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -162,7 +162,7 @@ icmp,vlan_tci=0x0000,dl_src=be:b6:f4:e1:49:4a,dl_dst=fe:71:d8:83:72:4f,nw_src=30 AT_CHECK([ovs-ofctl dump-ports int-br | grep 'port 5'], [0], [dnl port 5: rx pkts=1, bytes=98, drop=?, errs=?, frame=?, over=?, crc=? ]) -AT_CHECK([ovs-appctl dpif/dump-flows int-br], [0], [dnl +AT_CHECK([ovs-appctl dpif/dump-flows int-br | grep 'in_port(6081)'], [0], [dnl tunnel(tun_id=0x7b,src=1.1.2.92,dst=1.1.2.88,geneve({class=0xffff,type=0x80,len=4,0xa/0xf}{class=0xffff,type=0,len=4}),flags(-df-csum+key)),skb_mark(0),recirc_id(0),in_port(6081),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0, used:never, actions:userspace(pid=0,slow_path(controller)) ]) |