> Uniformly wait for calls to ovs-ofctl exit using > OVS_APP_EXIT_AND_WAIT() in the test-suite.
are they all necessary to avoid some races? in commit 0c473314, i intended to make it wait only when necessary. ie. only tests which have multiple "ovs-ofctl --pidfile". YAMAMOTO Takashi > > Signed-off-by: Simon Horman <ho...@verge.net.au> > > v2 > * Always use OVS_APP_EXIT_AND_WAIT(ovs-ofctl) instead of > OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > --- > tests/ofproto-dpif.at | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at > index 441cdf2..cb3e065 100644 > --- a/tests/ofproto-dpif.at > +++ b/tests/ofproto-dpif.at > @@ -328,7 +328,7 @@ AT_CHECK([tail -1 stdout], [0], > AT_CAPTURE_FILE([ofctl_monitor.log]) > AT_CHECK([ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir > --pidfile 2> ofctl_monitor.log]) > AT_CHECK([ovs-appctl ofproto/trace ovs-dummy > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' > -generate], [0], [stdout]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): table_id=1 cookie=0x0 total_len=34 in_port=1 (via > invalid_ttl) data_len=34 (unbuffered) > > ip,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=111,nw_tos=0,nw_ecn=0,nw_ttl=1 > @@ -504,7 +504,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=60 in_port=1 (via no_match) > data_len=60 (unbuffered) > > tcp,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=0x010 > tcp_csum:0 > @@ -539,7 +539,7 @@ dnl Test that missed packets are droped > for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > @@ -567,7 +567,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via no_match) data_len=60 > (unbuffered) > > tcp,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=0x010 > tcp_csum:0 > @@ -603,7 +603,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > > @@ -633,7 +633,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): table_id=1 cookie=0x0 total_len=60 in_port=1 (via > action) data_len=60 (unbuffered) > @@ -653,7 +653,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): table_id=253 cookie=0x0 total_len=60 in_port=1 (via > no_match) data_len=60 (unbuffered) > @@ -716,7 +716,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): table_id=253 cookie=0x0 total_len=60 in_port=1 (via > no_match) data_len=60 (unbuffered) > @@ -770,7 +770,7 @@ AT_CHECK([ovs-ofctl monitor br0 65534 -P nxm --detach > --no-chdir --pidfile 2> of > for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > @@ -800,7 +800,7 @@ dnl Test that missed packets are droped > for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > @@ -830,7 +830,7 @@ dnl Test that missed packets are droped > for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > @@ -861,7 +861,7 @@ dnl Test that missed packets are droped > for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)' > done > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > ]) > @@ -1335,7 +1335,7 @@ for i in 1 ; do > done > > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 9]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > NXT_PACKET_IN (xid=0x0): cookie=0x1 total_len=98 in_port=1 (via action) > data_len=98 (unbuffered) > > sctp,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=20:22:22:22:22:22,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=0,tp_src=1112,tp_dst=2223 > sctp_csum:d9d79157 > @@ -1413,7 +1413,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -ovs-appctl -t ovs-ofctl exit > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log], [0], [dnl > OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60 > (unbuffered) > @@ -1454,7 +1454,7 @@ for i in 1 2 3 ; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)' > done > OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6]) > -ovs-appctl -t ovs-ofctl exit > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) > > @@ -1731,7 +1731,7 @@ for i in 1 2 3; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=40:44:44:44:00:02,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=0,ttl=64,bos=1)' > done > OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3]) > -OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl > OFPT_PACKET_IN (OF1.2): total_len=64 in_port=1 (via action) data_len=64 > (unbuffered) > @@ -1968,7 +1968,7 @@ for i in 1 2 3; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=40:44:44:44:54:55,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))' > done > OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3]) > -ovs-appctl -t ovs-ofctl exit > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl > OFPT_PACKET_IN (OF1.2): total_len=64 in_port=1 (via action) data_len=64 > (unbuffered) > @@ -2107,7 +2107,7 @@ for i in 1 2 3; do > ovs-appctl netdev-dummy/receive p1 > 'in_port(1),eth(src=40:44:44:44:54:59,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))' > done > OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3]) > -ovs-appctl -t ovs-ofctl exit > +OVS_APP_EXIT_AND_WAIT(ovs-ofctl) > > AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl > OFPT_PACKET_IN (OF1.2): total_len=64 in_port=1 (via action) data_len=64 > (unbuffered) > -- > 1.8.5.2 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
