ofproto-dpif.at: Fix races in "NetFlow flow expiration" tests
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Fri, 4 Apr 2014 08:46:01 +0000 (17:46 +0900)
committerYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Tue, 8 Apr 2014 07:53:32 +0000 (16:53 +0900)
Acked-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
tests/ofproto-dpif.at

index 0dc9ff9..a92b6bf 100644 (file)
@@ -3346,6 +3346,7 @@ m4_define([CHECK_NETFLOW_EXPIRATION],
 
   for delay in 1000 30000; do
       ovs-appctl netdev-dummy/receive p1 'in_port(2),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=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
+      sleep 1  # ensure the order in which these two packets are processed
       ovs-appctl netdev-dummy/receive p2 'in_port(1),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'
 
       ovs-appctl time/warp $delay