From 83f325901aec28774ecb47798c46fe7c527f12e6 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 22 Oct 2021 15:27:50 -0400 Subject: [PATCH] tests: bfd_isis_topo1 expects unreasonable convergence times under load When our ci test system is under high load, expecting bfd to converge in under 2 seconds is not going to happen. Modify the test suites to just ensure that things converge. If we need actual functional testing of bfd response times the topotests are not an appropriate place to do this or we need to modify the test system to gather the data for how long it takes after the tests are run. Signed-off-by: Donald Sharp --- .../bfd_isis_topo1/test_bfd_isis_topo1.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py b/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py index 3c176f25a3..863c296927 100644 --- a/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py +++ b/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py @@ -72,7 +72,6 @@ import os import sys import pytest import json -from time import sleep from functools import partial # Save the Current Working Directory to find configuration files. @@ -193,15 +192,14 @@ def test_bfd_isis_interface_failure_rt2_step3(): # By default BFD provides a recovery time of 900ms plus jitter, so let's wait # initial 2 seconds to let the CI not suffer. # TODO: add check for array size - sleep(2) router_compare_json_output( - "rt1", "show ip route isis json", "step3/show_ip_route_rt2_down.ref", 1, 0 + "rt1", "show ip route isis json", "step3/show_ip_route_rt2_down.ref", 20, 10 ) router_compare_json_output( - "rt1", "show ipv6 route isis json", "step3/show_ipv6_route_rt2_down.ref", 1, 0 + "rt1", "show ipv6 route isis json", "step3/show_ipv6_route_rt2_down.ref", 20, 1 ) router_compare_json_output( - "rt1", "show bfd peers json", "step3/show_bfd_peers_rt2_down.ref", 1, 0 + "rt1", "show bfd peers json", "step3/show_bfd_peers_rt2_down.ref", 20, 1 ) # Check recovery, this can take some time @@ -232,15 +230,14 @@ def test_bfd_isis_interface_failure_rt3_step3(): # By default BFD provides a recovery time of 900ms plus jitter, so let's wait # initial 2 seconds to let the CI not suffer. # TODO: add check for array size - sleep(2) router_compare_json_output( - "rt1", "show ip route isis json", "step3/show_ip_route_rt3_down.ref", 1, 0 + "rt1", "show ip route isis json", "step3/show_ip_route_rt3_down.ref", 20, 1 ) router_compare_json_output( - "rt1", "show ipv6 route isis json", "step3/show_ipv6_route_rt3_down.ref", 1, 0 + "rt1", "show ipv6 route isis json", "step3/show_ipv6_route_rt3_down.ref", 20, 1 ) router_compare_json_output( - "rt1", "show bfd peers json", "step3/show_bfd_peers_rt3_down.ref", 1, 0 + "rt1", "show bfd peers json", "step3/show_bfd_peers_rt3_down.ref", 20, 1 ) # Check recovery, this can take some time -- 2.39.5