proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: add time to ldp vpls testcase

Browse Source 
Add some more wait time to an LDP vpls testcase - it seems to have
trouble in the CI sometimes.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-08-11 09:33:39 -04:00
parent 8e3ac40d2c
commit e513ad68d4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
View File

@ -154,7 +154,7 @@ def teardown_module(mod):
tgen.stop_topology() tgen.stop_topology()
def router_compare_json_output(rname, command, reference): def router_compare_json_output(rname, command, reference, count=80, wait=1):
"Compare router JSON output" "Compare router JSON output"
logger.info('Comparing router "%s" "%s" output', rname, command) logger.info('Comparing router "%s" "%s" output', rname, command)
@ -163,9 +163,9 @@ def router_compare_json_output(rname, command, reference):
filename = "{}/{}/{}".format(CWD, rname, reference) filename = "{}/{}/{}".format(CWD, rname, reference)
expected = json.loads(open(filename).read()) expected = json.loads(open(filename).read())
# Run test function until we get an result. Wait at most 80 seconds. # Run test function until we get an result.
test_func = partial(topotest.router_json_cmp, tgen.gears[rname], command, expected) test_func = partial(topotest.router_json_cmp, tgen.gears[rname], command, expected)
_, diff = topotest.run_and_expect(test_func, None, count=160, wait=0.5) _, diff = topotest.run_and_expect(test_func, None, count, wait)
assertmsg = '"{}" JSON output mismatches the expected result'.format(rname) assertmsg = '"{}" JSON output mismatches the expected result'.format(rname)
assert diff is None, assertmsg assert diff is None, assertmsg
@ -279,10 +279,12 @@ def test_ldp_pseudowires_after_link_down():
tgen.gears["r1"].peer_link_enable("r1-eth1", False) tgen.gears["r1"].peer_link_enable("r1-eth1", False)
topotest.sleep(5, "Waiting for the network to reconverge") topotest.sleep(5, "Waiting for the network to reconverge")
# check if the pseudowire is still up (using an alternate path for nexthop resolution) # check if the pseudowire is still up (using an alternate path
# for nexthop resolution). Give some extra wait time.
for rname in ["r1", "r2", "r3"]: for rname in ["r1", "r2", "r3"]:
router_compare_json_output( router_compare_json_output(
rname, "show l2vpn atom vc json", "show_l2vpn_vc.ref" rname, "show l2vpn atom vc json", "show_l2vpn_vc.ref",
count=160, wait=1
) )