tests: Set minimum wait time for tests to 5 seconds

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-11-22 11:17:27 +02:00
parent a5722d5a78
commit d3a6af081e
9 changed files with 19 additions and 19 deletions

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,
)

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,
)

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",

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

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
)

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:

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

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:

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: