tests: Fix race in 'balance-tcp bonding' test.

Running the test in a tight loop could cause this test to fail after about 5 runs, with some of the ports reporting "may_enable: false" in the "ovs-appctl bond/show" output. This commit fixes the race condition by waiting for may_enable to be true for all bond ports. I suspect that LACP negotiation finishes, but the main thread doesn't have a chance to enable the ports before we send the test packets. Signed-off-by: Joe Stringer <[email protected]> Acked-by: Ben Pfaff <[email protected]>
mikephp · Jul 7, 2014 · 48105e8 · 48105e8
1 parent 91e12f0
commit 48105e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
@@ -125,7 +125,7 @@ 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
 ], [])
-WAIT_FOR_DUMMY_PORTS([p4], [p5], [p6])
+OVS_WAIT_WHILE([ovs-appctl bond/show | grep "may_enable: false"])
 ovs-appctl time/stop
 ovs-appctl time/warp 100
 ovs-appctl lacp/show > lacp.txt