diff options
author | Ben Pfaff <blp@nicira.com> | 2014-02-27 11:18:31 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2014-02-27 11:19:01 -0800 |
commit | 3b401f9baf4c0dd9e9eebb0a9f4417fdf3a80774 (patch) | |
tree | aa938fd336ac13be0ea61ac7f033ed1ecd55438f /tests | |
parent | 691e47554dd03dd6492e00bab5bd6d215f5cbd4f (diff) | |
download | openvswitch-3b401f9baf4c0dd9e9eebb0a9f4417fdf3a80774.tar.gz |
tests: Re-fix a race.
Patch bf06c4fe (tests/ofproto-dpif.at: Workaround a race.), fixed a
race condition which patch 0a8763f (ofproto-dpif-upcall: Hardcode
max_idle to 1500ms.) unfixed.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ofproto-dpif.at | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 8e21d11f7..095c25875 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -3098,10 +3098,16 @@ AT_CHECK([ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3]) for i in $(seq 1 10); do ovs-appctl netdev-dummy/receive br0 'in_port(100),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)' + if [[ $i -eq 1 ]]; then + sleep 1 + fi done for i in $(seq 1 5); do ovs-appctl netdev-dummy/receive br1 'in_port(101),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=8,code=0)' + if [[ $i -eq 1 ]]; then + sleep 1 + fi done AT_CHECK([ovs-appctl time/warp 500], [0], |