tests: Increase timing of bgp_duplicate_nexthop

a) Make timers more aggressive for this test
b) Double run_and_expect time for one sub test.

These two changes cause this test to pass regularly for
me when this test used to fail regularly for me.

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

diff --git a/tests/topotests/bgp_duplicate_nexthop/r1/bgpd.conf b/tests/topotests/bgp_duplicate_nexthop/r1/bgpd.conf
index 31f06dbb9031d7449a2c0c57811b6c1497c948a1..8084962587ddcfcf1af8c4027fbeff2294144df4 100644 (file)
--- a/tests/topotests/bgp_duplicate_nexthop/r1/bgpd.conf
+++ b/tests/topotests/bgp_duplicate_nexthop/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 64500
  bgp router-id 192.0.2.1
+ timers bgp 3 9
  no bgp ebgp-requires-policy
  neighbor rrserver peer-group
  neighbor rrserver remote-as 64500

diff --git a/tests/topotests/bgp_duplicate_nexthop/r3/bgpd.conf b/tests/topotests/bgp_duplicate_nexthop/r3/bgpd.conf
index 2b03f51a237633118bf5d6b168309c48e2c74459..7312dba4076916221d9c7c7e985535d61cfc9b11 100644 (file)
--- a/tests/topotests/bgp_duplicate_nexthop/r3/bgpd.conf
+++ b/tests/topotests/bgp_duplicate_nexthop/r3/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 64500 view one
+ timers bgp 3 9
  bgp router-id 192.0.2.3
  neighbor rr peer-group
  neighbor rr remote-as 64500

diff --git a/tests/topotests/bgp_duplicate_nexthop/r5/bgpd.conf b/tests/topotests/bgp_duplicate_nexthop/r5/bgpd.conf
index 272183b1ac83318e40713c7adb1d781fa9f5c16e..e46d7c5ed4c319d13989c02ccc7e58f8ddf754a1 100644 (file)
--- a/tests/topotests/bgp_duplicate_nexthop/r5/bgpd.conf
+++ b/tests/topotests/bgp_duplicate_nexthop/r5/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 64500
+ timers bgp 3 9
  bgp router-id 192.0.2.5
  no bgp ebgp-requires-policy
  no bgp network import-check

diff --git a/tests/topotests/bgp_duplicate_nexthop/r6/bgpd.conf b/tests/topotests/bgp_duplicate_nexthop/r6/bgpd.conf
index 68bd36eb8a8069ddfe7045f00e8d693a76ae1800..3aa9adb18bdbb702ef6feaa5725a94a87b54c483 100644 (file)
--- a/tests/topotests/bgp_duplicate_nexthop/r6/bgpd.conf
+++ b/tests/topotests/bgp_duplicate_nexthop/r6/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 64500
+ timers bgp 3 9
  bgp router-id 192.0.2.6
  no bgp ebgp-requires-policy
  no bgp network import-check

diff --git a/tests/topotests/bgp_duplicate_nexthop/test_bgp_duplicate_nexthop.py b/tests/topotests/bgp_duplicate_nexthop/test_bgp_duplicate_nexthop.py
index 83fae71bf59f26863837a023f1035a046b62c794..b458c64e33f009d98d45e6c2862fa786c8d332d8 100644 (file)
--- a/tests/topotests/bgp_duplicate_nexthop/test_bgp_duplicate_nexthop.py
+++ b/tests/topotests/bgp_duplicate_nexthop/test_bgp_duplicate_nexthop.py
@@ -212,7 +212,7 @@ def check_ipv4_prefix_with_multiple_nexthops(prefix, multipath=True):
     test_func = functools.partial(
         ip_check_path_selection, tgen.gears["r1"], prefix, expected
     )
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    _, result = topotest.run_and_expect(test_func, None, count=120, wait=0.5)
     assert (
         result is None
     ), f"Failed to check that {prefix} uses the IGP label 16055 and 16006"