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

Merge pull request #9819 from donaldsharp/deprecation_python

Browse Source 
tests: Fix `Invalid escape sequence` warnings in test runs
This commit is contained in:
Russ White 2021-10-13 13:55:06 -04:00 committed by GitHub
commit c9adeefcfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py
View File

@ -4,7 +4,7 @@ from lib import topotest
ret = luCommand( ret = luCommand(
"r2", "r2",
"ip -M route show", "ip -M route show",
"\d*(?= via inet 10.0.2.4 dev r2-eth1)", r"\d*(?= via inet 10.0.2.4 dev r2-eth1)",
"wait", "wait",
"See mpls route to r4", "See mpls route to r4",
) )
@ -16,7 +16,7 @@ if ret != False and found != None:
ret = luCommand( ret = luCommand(
"r2", "r2",
"ip -M route show", "ip -M route show",
"\d*(?= via inet 10.0.1.1 dev r2-eth0)", r"\d*(?= via inet 10.0.1.1 dev r2-eth0)",
"wait", "wait",
"See mpls route to r1", "See mpls route to r1",
) )

4
tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
View File

@ -21,7 +21,7 @@ for rtr in rtrs:
ret = luCommand( ret = luCommand(
rtr, rtr,
'vtysh -c "show memory"', 'vtysh -c "show memory"',
"zebra: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*) .*bgpd: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*)", r"zebra: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*) .*bgpd: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*)",
"none", "none",
"collect bgpd memory stats", "collect bgpd memory stats",
) )
@ -188,7 +188,7 @@ else:
ret = luCommand( ret = luCommand(
rtr, rtr,
'vtysh -c "show memory"', 'vtysh -c "show memory"',
"zebra: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*) .*bgpd: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*)", r"zebra: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*) .*bgpd: System allocator statistics: Total heap allocated: *(\d*) ([A-Za-z]*)",
"none", "none",
"collect bgpd memory stats", "collect bgpd memory stats",
) )

2
tests/topotests/lib/ltemplate.py
View File

@ -291,7 +291,7 @@ def ltemplateVersionCheck(
# collect/log info on iproute2 # collect/log info on iproute2
cc = ltemplateRtrCmd() cc = ltemplateRtrCmd()
found = cc.doCmd( found = cc.doCmd(
tgen, rname, "apt-cache policy iproute2", "Installed: ([\d\.]*)" tgen, rname, "apt-cache policy iproute2", r"Installed: ([\d\.]*)"
) )
if found != None: if found != None:
iproute2Ver = found.group(1) iproute2Ver = found.group(1)