proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-01 12:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12342 from opensourcerouting/fix/small_waiting_times

Browse Source 
tests: Fail tests immediately if they use too low wait/count values
This commit is contained in:
Donald Sharp 2022-11-28 08:10:23 -05:00 committed by GitHub
commit d58334ea1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
View File

@ -1054,7 +1054,7 @@ def test_rib_ipv6_step24():
rname,
"show ipv6 route isis json",
outputs[rname][15]["show_ipv6_route.ref"],
count=5,
count=10,
)

12
tests/topotests/isis_tilfa_topo1/test_isis_tilfa_topo1.py
View File

@ -831,19 +831,19 @@ def test_rt6_step11():
rname,
"show ip route isis json",
outputs[rname][11]["show_ip_route.ref"],
count=5,
count=10,
)
router_compare_json_output(
rname,
"show ipv6 route isis json",
outputs[rname][11]["show_ipv6_route.ref"],
count=5,
count=10,
)
router_compare_json_output(
rname,
"show mpls table json",
outputs[rname][11]["show_mpls_table.ref"],
count=5,
count=10,
)
@ -1028,19 +1028,19 @@ def test_rt6_step14():
rname,
"show ip route isis json",
outputs[rname][11]["show_ip_route.ref"],
count=5,
count=10,
)
router_compare_json_output(
rname,
"show ipv6 route isis json",
outputs[rname][11]["show_ipv6_route.ref"],
count=5,
count=10,
)
router_compare_json_output(
rname,
"show mpls table json",
outputs[rname][11]["show_mpls_table.ref"],
count=5,
count=10,
)

20
tests/topotests/lib/topotest.py
View File

@ -355,6 +355,16 @@ def run_and_expect(func, what, count=20, wait=3):
else:
func_name = func.__name__
# Just a safety-check to avoid running topotests with very
# small wait/count arguments.
wait_time = wait * count
if wait_time < 5:
assert (
wait_time >= 5
), "Waiting time is too small (count={}, wait={}), adjust timer values".format(
count, wait
)
logger.info(
"'{}' polling started (interval {} secs, maximum {} tries)".format(
func_name, wait, count
@ -402,6 +412,16 @@ def run_and_expect_type(func, etype, count=20, wait=3, avalue=None):
else:
func_name = func.__name__
# Just a safety-check to avoid running topotests with very
# small wait/count arguments.
wait_time = wait * count
if wait_time < 5:
assert (
wait_time >= 5
), "Waiting time is too small (count={}, wait={}), adjust timer values".format(
count, wait
)
logger.info(
"'{}' polling started (interval {} secs, maximum wait {} secs)".format(
func_name, wait, int(wait * count)

4
tests/topotests/ospf6_gr_topo1/test_ospf6_gr_topo1.py
View File

@ -224,7 +224,7 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
if restarting != None:
tries = 40
else:
tries = 1
tries = 10
router_compare_json_output(
rname, "show ipv6 route ospf json", "show_ipv6_route.json", tries
)
@ -246,7 +246,7 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
if initial_convergence == True or restarting == rname:
tries = 240
else:
tries = 1
tries = 10
router_compare_json_output(
rname,
"show ipv6 ospf database json",

2
tests/topotests/ospf6_topo2/test_ospf6_topo2.py
View File

@ -243,7 +243,7 @@ def test_ospf6_default_route():
"show ipv6 route json",
{route: [{"metric": metric}]},
)
_, result = topotest.run_and_expect(test_func, None, count=4, wait=1)
_, result = topotest.run_and_expect(test_func, None, count=5, wait=1)
assertmsg = '"{}" convergence failure'.format(router)
assert result is None, assertmsg

4
tests/topotests/ospf_gr_topo1/test_ospf_gr_topo1.py
View File

@ -233,7 +233,7 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
if restarting != None:
tries = 60
else:
tries = 1
tries = 10
router_compare_json_output(
rname, "show ip route ospf json", "show_ip_route.json", tries
)
@ -252,7 +252,7 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
if initial_convergence == True or restarting == rname:
tries = 240
else:
tries = 1
tries = 10
router_compare_json_output(
rname, "show ip ospf database json", "show_ip_ospf_database.json", tries
)

2
tests/topotests/pim_basic/test_pim.py
View File

@ -225,7 +225,7 @@ def test_pim_igmp_report():
test_func = partial(
topotest.router_json_cmp, r1, "show ip pim upstream json", expected
)
_, result = topotest.run_and_expect(test_func, None, count=5, wait=0.5)
_, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5)
assertmsg = '"{}" JSON output mismatches'.format(r1.name)
assert result is None, assertmsg
finally:

4
tests/topotests/pim_basic_topo2/test_pim_basic_topo2.py
View File

@ -175,7 +175,7 @@ def test_pim_reconvergence():
"show ip pim neighbor json",
{interface: {peer: None}},
)
_, result = topotest.run_and_expect(test_func, None, count=4, wait=1)
_, result = topotest.run_and_expect(test_func, None, count=5, wait=1)
assertmsg = '"{}" PIM convergence failure'.format(router)
assert result is None, assertmsg
@ -201,7 +201,7 @@ def test_pim_bfd_profile():
"show bfd peers json",
[settings],
)
_, result = topotest.run_and_expect(test_func, None, count=4, wait=1)
_, result = topotest.run_and_expect(test_func, None, count=5, wait=1)
assertmsg = '"{}" BFD convergence failure'.format(router)
assert result is None, assertmsg

4
tests/topotests/srv6_locator/test_srv6_locator.py
View File

@ -94,12 +94,12 @@ def test_srv6():
def check_srv6_locator(router, expected_file):
func = functools.partial(_check_srv6_locator, router, expected_file)
success, result = topotest.run_and_expect(func, None, count=5, wait=0.5)
success, result = topotest.run_and_expect(func, None, count=10, wait=0.5)
assert result is None, "Failed"
def check_sharpd_chunk(router, expected_file):
func = functools.partial(_check_sharpd_chunk, router, expected_file)
success, result = topotest.run_and_expect(func, None, count=5, wait=0.5)
success, result = topotest.run_and_expect(func, None, count=10, wait=0.5)
assert result is None, "Failed"
# FOR DEVELOPER:

4
tests/topotests/srv6_locator_custom_bits_length/test_srv6_locator.py
View File

@ -90,12 +90,12 @@ def test_srv6():
def check_srv6_locator(router, expected_file):
func = functools.partial(_check_srv6_locator, router, expected_file)
success, result = topotest.run_and_expect(func, None, count=5, wait=0.5)
success, result = topotest.run_and_expect(func, None, count=10, wait=0.5)
assert result is None, "Failed"
def check_sharpd_chunk(router, expected_file):
func = functools.partial(_check_sharpd_chunk, router, expected_file)
success, result = topotest.run_and_expect(func, None, count=5, wait=0.5)
success, result = topotest.run_and_expect(func, None, count=10, wait=0.5)
assert result is None, "Failed"
# FOR DEVELOPER: