From: Donald Sharp Date: Mon, 3 Jul 2023 20:12:16 +0000 (-0400) Subject: tests: bgp_flowspec expand timings X-Git-Tag: base_9.1~258^2~2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=162b61ec162d07c673529407234b2a29368ff9ee;p=matthieu%2Ffrr.git tests: bgp_flowspec expand timings Attempt to set the hold time in the bgp flowspec exabgp config. In addition it was noticed that upstream bgp_flowspec tests are still not negotiating peering within the time frame specified. This is because the first tcp packet is missed and no keepalive/hold time are negotiated and exabgp will not attempt a reconnect for quite some time. Make this test slower when things go south. Signed-off-by: Donald Sharp --- diff --git a/tests/topotests/bgp_flowspec/peer1/exabgp.cfg b/tests/topotests/bgp_flowspec/peer1/exabgp.cfg index cd1fae5aba..383a95b6dd 100644 --- a/tests/topotests/bgp_flowspec/peer1/exabgp.cfg +++ b/tests/topotests/bgp_flowspec/peer1/exabgp.cfg @@ -1,5 +1,6 @@ neighbor 10.0.1.1 { router-id 10.0.1.101; +hold-time 10; local-address 10.0.1.101; local-as 100; peer-as 100; diff --git a/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py b/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py index b1bec1034b..a2be85962f 100644 --- a/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py +++ b/tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py @@ -138,11 +138,12 @@ def test_bgp_convergence(): test_func = functools.partial( topotest.router_json_cmp, router, "show bgp summary json", expected ) - _, res = topotest.run_and_expect(test_func, None, count=90, wait=0.5) + _, res = topotest.run_and_expect(test_func, None, count=210, wait=1) assertmsg = "BGP router network did not converge" if res is not None: generate_support_bundle() assert res is None, assertmsg + generate_support_bundle() def test_bgp_flowspec():