[ovs-dev] [PATCH] tests/ofproto-dpif.at: Add delay before stopping time.

Jarno Rajahalme jrajahalme at nicira.com
Wed Jun 4 19:00:52 UTC 2014


Add 2 second sleep before time stop to allow internal ports to
reconnect in case the initial connection attempt failed.

Bond tests sometimes persistently fail without these delays.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
---
 tests/ofproto-dpif.at |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index c14d671..9987100 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -17,7 +17,7 @@ OVS_VSWITCHD_START(
    add-port br1 p4 -- set interface p4 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=4 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --])
 AT_CHECK([ovs-appctl vlog/set dpif:dbg])
-
+sleep 2
 AT_CHECK([ovs-ofctl add-flow br0 action=normal])
 AT_CHECK([ovs-ofctl add-flow br1 action=normal])
 ovs-appctl netdev-dummy/set-admin-state up
@@ -66,7 +66,7 @@ OVS_VSWITCHD_START(
    add-port br1 p5 -- set interface p5 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=5 -- \
    add-port br1 p6 -- set interface p6 type=dummy options:stream=unix:$OVS_RUNDIR/p3.sock ofport_request=6 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --])
-
+sleep 2
 AT_CHECK([ovs-ofctl add-flow br0 action=normal])
 AT_CHECK([ovs-ofctl add-flow br1 action=normal])
 AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
@@ -113,13 +113,13 @@ OVS_VSWITCHD_START(
    set interface p5 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=5 -- \
    set interface p6 type=dummy options:stream=unix:$OVS_RUNDIR/p3.sock ofport_request=6 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --])
+sleep 2
 AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
 ])
 AT_CHECK([ovs-ofctl add-flow br0 action=normal])
 AT_CHECK([ovs-ofctl add-flow br1 action=normal])
 AT_CHECK([ovs-appctl upcall/disable-megaflows], [0], [megaflows disabled
 ], [])
-sleep 1;
 ovs-appctl time/stop
 ovs-appctl time/warp 100
 ovs-appctl lacp/show > lacp.txt
-- 
1.7.10.4




More information about the dev mailing list