diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/topotests/bfd_topo1/test_bfd_topo1.py | 2 | ||||
| -rw-r--r-- | tests/topotests/bfd_topo2/test_bfd_topo2.py | 2 | ||||
| -rw-r--r-- | tests/topotests/lib/common_config.py | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tests/topotests/bfd_topo1/test_bfd_topo1.py b/tests/topotests/bfd_topo1/test_bfd_topo1.py index adf02b02d4..c9020f16d3 100644 --- a/tests/topotests/bfd_topo1/test_bfd_topo1.py +++ b/tests/topotests/bfd_topo1/test_bfd_topo1.py @@ -100,7 +100,7 @@ def test_bfd_connection(): test_func = partial( topotest.router_json_cmp, router, "show bfd peers json", expected ) - _, result = topotest.run_and_expect(test_func, None, count=8, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=30, wait=0.5) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg diff --git a/tests/topotests/bfd_topo2/test_bfd_topo2.py b/tests/topotests/bfd_topo2/test_bfd_topo2.py index 57ce0cdf09..a9b9358ef0 100644 --- a/tests/topotests/bfd_topo2/test_bfd_topo2.py +++ b/tests/topotests/bfd_topo2/test_bfd_topo2.py @@ -144,7 +144,7 @@ def test_bfd_connection(): test_func = partial( topotest.router_json_cmp, router, "show bfd peers json", expected ) - _, result = topotest.run_and_expect(test_func, None, count=8, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=30, wait=0.5) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py index 5a5c7e3df4..3f70dbddf7 100644 --- a/tests/topotests/lib/common_config.py +++ b/tests/topotests/lib/common_config.py @@ -3245,7 +3245,7 @@ def configure_interface_mac(tgen, input_dict): ############################################# # Verification APIs ############################################# -@retry(retry_timeout=12) +@retry(retry_timeout=40) def verify_rib( tgen, addr_type, @@ -3383,6 +3383,10 @@ def verify_rib( st_found = True found_routes.append(st_rt) + if "queued" in rib_routes_json[st_rt][0]: + errormsg = "Route {} is queued\n".format(st_rt) + return errormsg + if fib and next_hop: if type(next_hop) is not list: next_hop = [next_hop] @@ -3607,6 +3611,10 @@ def verify_rib( st_found = True found_routes.append(st_rt) + if "queued" in rib_routes_json[st_rt][0]: + errormsg = "Route {} is queued\n".format(st_rt) + return errormsg + if next_hop: if type(next_hop) is not list: next_hop = [next_hop] |