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

topotest: allow passing options to difflib

Browse Source 
Extend the topotest diff functions to allow receiving difflib options.
This commit is contained in:
Rafael Zalamena 2017-09-20 12:04:23 -03:00 committed by Donald Sharp
parent 566567e9be
commit bc2872fd17
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,20 +198,20 @@ def pid_exists(pid):
else:
return True
def get_textdiff(text1, text2, title1="", title2=""):
def get_textdiff(text1, text2, title1="", title2="", **opts):
"Returns empty string if same or formatted diff"
diff = '\n'.join(difflib.unified_diff(text1, text2,
fromfile=title1, tofile=title2))
fromfile=title1, tofile=title2, **opts))
# Clean up line endings
diff = os.linesep.join([s for s in diff.splitlines() if s])
return diff
def difflines(text1, text2, title1='', title2=''):
def difflines(text1, text2, title1='', title2='', **opts):
"Wrapper for get_textdiff to avoid string transformations."
text1 = ('\n'.join(text1.rstrip().splitlines()) + '\n').splitlines(1)
text2 = ('\n'.join(text2.rstrip().splitlines()) + '\n').splitlines(1)
return get_textdiff(text1, text2, title1, title2)
return get_textdiff(text1, text2, title1, title2, **opts)
def get_file(content):
"""