tests: Expand 'bundle with many ports' test.

[cascardo/ovs.git] / tests / bfd.at

diff --git a/tests/bfd.at b/tests/bfd.at
index 609c0ad..925af77 100644 (file)
--- a/tests/bfd.at
+++ b/tests/bfd.at
@@ -290,7 +290,7 @@ ovs-appctl time/warp 5000 500
 BFD_CHECK_TX([p0], [500ms], [300ms], [500ms])
 BFD_CHECK_RX([p0], [3000ms], [3000ms], [500ms])
 
-# advance clock by 5000ms and check the the flags are all 'none'.
+# advance clock by 5000ms and check the flags are all 'none'.
 ovs-appctl time/warp 5000 500
 BFD_CHECK([p0], [true], [false], [none], [up], [No Diagnostic], [none], [up], [No Diagnostic])
 BFD_CHECK([p1], [true], [false], [none], [up], [No Diagnostic], [none], [up], [No Diagnostic])
@@ -442,6 +442,7 @@ done
 BFD_CHECK([p0], [false], [false], [none], [down], [No Diagnostic], [none], [down], [No Diagnostic])
 
 AT_CHECK([ovs-vsctl del-br br1], [0], [ignore])
+OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 
@@ -509,6 +510,7 @@ BFD_CHECK_TX([p0], [500ms], [500ms], [300ms])
 BFD_CHECK_RX([p0], [500ms], [500ms], [300ms])
 
 AT_CHECK([ovs-vsctl del-br br1], [0], [ignore])
+OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 # forwarding_if_rx Test3
@@ -596,6 +598,7 @@ BFD_CHECK_TX([p0], [300ms], [300ms], [300ms])
 BFD_CHECK_RX([p0], [1000ms], [1000ms], [300ms])
 
 AT_CHECK([ovs-vsctl del-br br1], [0], [ignore])
+OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 # forwarding_if_rx Test4
@@ -664,6 +667,7 @@ done
 BFD_CHECK([p0], [false], [false], [none], [down], [Control Detection Time Expired], [none], [down], [No Diagnostic])
 
 AT_CHECK([ovs-vsctl del-br br1], [0], [ignore])
+OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 # test bfd:flap_count.
@@ -684,6 +688,9 @@ OVS_VSWITCHD_START([add-br br1 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=100 bfd:min_rx=100])
 
 ovs-appctl time/stop
+# Disable the stats update to prevent the race between ovsdb updating
+# stats and ovs-vsctl cmd closing the jsonrpc session.
+AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:stats-update-interval=50000000])
 
 # Part-1 wait for a while to stablize bfd.
 ovs-appctl time/warp 10100 100