topotests: Modify bgp convergence to be more than 120 seconds

Waiting 10 seconds for bgp convergence makes no sense, especially
if the test system is under load and a node is started up before
the node it is connecting to is up. We should wait for the full
default of 120 seconds, plus a little time to ensure nothing is
screwed up too much.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.py b/tests/topotests/bfd-topo1/test_bfd_topo1.py
index 91904c6aae6e7f1fd65735b424061e51d990f392..4fd4f97436361684c2519c64c20ed4d2921bf603 100644 (file)
--- a/tests/topotests/bfd-topo1/test_bfd_topo1.py
+++ b/tests/topotests/bfd-topo1/test_bfd_topo1.py
@@ -138,7 +138,7 @@ def test_bgp_convergence():
         expected = json.loads(open(ref_file).read())
         test_func = partial(topotest.router_json_cmp,
                             router, 'show ip bgp summary json', expected)
-        _, res = topotest.run_and_expect(test_func, None, count=20, wait=0.5)
+        _, res = topotest.run_and_expect(test_func, None, count=125, wait=1.0)
         assertmsg = '{}: bgp did not converge'.format(router.name)
         assert res is None, assertmsg