From: Alex Wang Date: Wed, 16 Apr 2014 18:01:12 +0000 (-0700) Subject: ofproto-dpif.at: Fix a race. X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~123 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9bbd18e2db38b91ffee659fb673c77bb0f4efeaa;p=sliver-openvswitch.git ofproto-dpif.at: Fix a race. For the fixed line, the ofctl_monitor.log should have 18 lines. So, should wait until it reaches 18 lines. Signed-off-by: Alex Wang Acked-by: Joe Stringer --- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index b12b4fe17..8201d6b7a 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1500,7 +1500,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([test `wc -l < ofctl_monitor.log` -ge 18]) 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)