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

Merge pull request #12655 from donaldsharp/pim_basic_cleanups

Browse Source 
tests: pim_basic fails in micronet
This commit is contained in:
Christian Hopps 2023-01-19 11:41:44 -05:00 committed by GitHub
commit c2c17459ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ def test_pim_rp_setup():
test_func = partial( test_func = partial(
topotest.router_json_cmp, r1, "show ip pim rp-info json", expected topotest.router_json_cmp, r1, "show ip pim rp-info json", expected
) )
_, result = topotest.run_and_expect(test_func, None, count=15, wait=5) _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
assertmsg = '"{}" JSON output mismatches'.format(r1.name) assertmsg = '"{}" JSON output mismatches'.format(r1.name)
assert result is None, assertmsg assert result is None, assertmsg
# tgen.mininet_cli() # tgen.mininet_cli()
@ -148,13 +148,13 @@ def test_pim_send_mcast_stream():
# Let's establish a S,G stream from r2 -> r1 # Let's establish a S,G stream from r2 -> r1
CWD = os.path.dirname(os.path.realpath(__file__)) CWD = os.path.dirname(os.path.realpath(__file__))
r2.run( r2.run(
"{}/mcast-tx.py --ttl 5 --count 5 --interval 10 229.1.1.1 r2-eth0 > /tmp/bar".format( "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r2-eth0 > /tmp/bar".format(
CWD CWD
) )
) )
# And from r3 -> r1 # And from r3 -> r1
r3.run( r3.run(
"{}/mcast-tx.py --ttl 5 --count 5 --interval 10 229.1.1.1 r3-eth0 > /tmp/bar".format( "{}/mcast-tx.py --ttl 5 --count 40 --interval 2 229.1.1.1 r3-eth0 > /tmp/bar".format(
CWD CWD
) )
) )
@ -175,7 +175,7 @@ def test_pim_send_mcast_stream():
test_func = partial( test_func = partial(
topotest.router_json_cmp, r1, "show ip pim upstream json", expected topotest.router_json_cmp, r1, "show ip pim upstream json", expected
) )
_, result = topotest.run_and_expect(test_func, None, count=20, wait=1) _, result = topotest.run_and_expect(test_func, None, count=40, wait=1)
assert result is None, "failed to converge pim" assert result is None, "failed to converge pim"
# tgen.mininet_cli() # tgen.mininet_cli()
@ -191,7 +191,7 @@ def test_pim_rp_sees_stream():
test_func = partial( test_func = partial(
topotest.router_json_cmp, rp, "show ip pim upstream json", expected topotest.router_json_cmp, rp, "show ip pim upstream json", expected
) )
_, result = topotest.run_and_expect(test_func, None, count=20, wait=0.5) _, result = topotest.run_and_expect(test_func, None, count=40, wait=1)
assertmsg = '"{}" JSON output mismatches'.format(rp.name) assertmsg = '"{}" JSON output mismatches'.format(rp.name)
assert result is None, assertmsg assert result is None, assertmsg
@ -225,7 +225,7 @@ def test_pim_igmp_report():
test_func = partial( test_func = partial(
topotest.router_json_cmp, r1, "show ip pim upstream json", expected topotest.router_json_cmp, r1, "show ip pim upstream json", expected
) )
_, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5) _, result = topotest.run_and_expect(test_func, None, count=40, wait=1)
assertmsg = '"{}" JSON output mismatches'.format(r1.name) assertmsg = '"{}" JSON output mismatches'.format(r1.name)
assert result is None, assertmsg assert result is None, assertmsg
finally: finally:

2
tests/topotests/zebra_netlink/test_zebra_netlink.py
View File

@ -109,7 +109,7 @@ def test_zebra_netlink_batching(tgen):
pfx = str(ipaddress.ip_network((i, 32))) pfx = str(ipaddress.ip_network((i, 32)))
match[pfx] = [dict(entry, prefix=pfx)] match[pfx] = [dict(entry, prefix=pfx)]
ok = topotest.router_json_cmp_retry(r1, "show ip route json", match) ok = topotest.router_json_cmp_retry(r1, "show ip route json", match, False, 30)
assert ok, '"r1" JSON output mismatches' assert ok, '"r1" JSON output mismatches'
r1.vtysh_cmd("sharp remove routes 2.1.3.7 " + str(count)) r1.vtysh_cmd("sharp remove routes 2.1.3.7 " + str(count))