From: YAMAMOTO Takashi Date: Fri, 24 Jan 2014 01:31:11 +0000 (+0900) Subject: ofprot-dpif.at: Fix races X-Git-Tag: sliver-openvswitch-2.1.90-1~8^2~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8125a83a515325dfdf24fbc5074d0d0589b57814;p=sliver-openvswitch.git ofprot-dpif.at: Fix races Fix races in "ofproto-dpif - controller" test. Signed-off-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 6fe0269ed..04a3a070c 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -855,6 +855,7 @@ for i in 1 2 3; do ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=80:88:88:88:88:88,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' done +OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 9]) OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) AT_CHECK([cat ofctl_monitor.log], [0], [dnl NXT_PACKET_IN (xid=0x0): cookie=0xd total_len=60 in_port=1 (via action) data_len=60 (unbuffered) @@ -886,6 +887,7 @@ for i in 1 ; do ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 20 22 22 22 22 22 08 00 45 00 00 24 00 00 00 00 00 84 00 00 C0 A8 00 01 C0 A8 00 02 04 58 08 af 00 00 00 00 d9 d7 91 57 01 00 00 34 cf 28 ec 4e 00 01 40 00 00 0a ff ff b7 53 24 19 00 05 00 08 7f 00 00 01 00 05 00 08 c0 a8 02 07 00 0c 00 06 00 05 00 00 80 00 00 04 c0 00 00 04' done +OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 9]) OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit]) 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)