From: Ben Pfaff <blp@nicira.com>
Date: Thu, 28 Mar 2013 18:45:47 +0000 (-0700)
Subject: lacp: Stop time to avoid dependency on real time in negotiation test.
X-Git-Tag: sliver-openvswitch-1.10.90-1~10^2~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8e63fd14f921f0a5c97a3cfcf74381f05ce51f89;hp=7cd4615505a3b2b6936cd61b82d30aba95d8f184;p=sliver-openvswitch.git

lacp: Stop time to avoid dependency on real time in negotiation test.

Commit f3103dfa00d (lacp.at: Change timing of lacp - negotiation test)
fixed test failures for the lacp negotiation test on some systems, but
made it crop up on others where it hadn't appeared before.

My guess is that this commit is the real fix.  If it isn't, then we
will probably just have to remove the test or disable it, much as I
hate doing that.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/tests/lacp.at b/tests/lacp.at
index 85447c9aa..0bcd4b3b1 100644
--- a/tests/lacp.at
+++ b/tests/lacp.at
@@ -141,6 +141,8 @@ OVS_VSWITCHD_START(
 AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
 ])
 
+ovs-appctl time/stop
+
 # Wait for up to 5 (simulated) seconds, until LACP negotiation finishes.
 i=0
 while :; do
@@ -296,7 +298,7 @@ AT_CHECK([ovs-vsctl \
 -- add-port br0 null0 -- set int null0 type=patch options:peer=p2 -- set int p2 options:peer=null0 \
 -- add-port br1 null1 -- set int null1 type=patch options:peer=p0 -- set int p0 options:peer=null1])
 
-for i in `seq 0 25`; do ovs-appctl time/warp 100; done
+for i in `seq 0 40`; do ovs-appctl time/warp 100; done
 AT_CHECK(
   [ovs-appctl lacp/show bond0
 ovs-appctl lacp/show bond1