Depending on how output buffers are flushed, there might
be still races. But this at least makes the race windows smaller.
Signed-off-by: YAMAMOTO Takashi <yamam...@valinux.co.jp>
---
tests/ofproto-dpif.at | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 167654d..d2234e9 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -1584,7 +1584,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:00:00,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)'
done
-sleep 1
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1617,7 +1617,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:00:01,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=0,ttl=64,bos=1)'
done
-sleep 1
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1652,7 +1652,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
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
-sleep 1
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1710,7 +1710,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:50,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)'
done
-sleep 1
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1747,7 +1747,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:51,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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1781,6 +1781,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:52,dst=52: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)'
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])
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1817,7 +1818,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:53,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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1851,7 +1852,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:54,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)'
done
-OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1888,7 +1889,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1922,7 +1923,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:56,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)'
done
-OVS_WAIT_UNTIL([test `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1959,7 +1960,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0 -m
65534 -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:57,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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -1993,7 +1994,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
for i in 1 2 3; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=40:44:44:44:54:58,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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
@@ -2027,7 +2028,7 @@ AT_CHECK([ovs-ofctl --protocols=OpenFlow12 monitor br0
65534 -m -P nxm --detach
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 `wc -l < ofctl_monitor.log` -ge 6])
+OVS_WAIT_UNTIL([test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3])
ovs-appctl -t ovs-ofctl exit
AT_CHECK([cat ofctl_monitor.log | ofctl_strip], [0], [dnl
--
1.8.3.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
