proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 16:17:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13565 from LabNConsulting/chopps/munet-update

Browse Source
This commit is contained in:
Igor Ryzhov 2023-05-20 14:11:05 +03:00 committed by GitHub
commit c4676ad917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/topotests/munet/cli.py
View File

@ -281,7 +281,6 @@ async def async_input(prompt, histfile):
def make_help_str(unet): def make_help_str(unet):
w = sorted([x if x else "" for x in unet.cli_in_window_cmds]) w = sorted([x if x else "" for x in unet.cli_in_window_cmds])
ww = unet.cli_in_window_cmds ww = unet.cli_in_window_cmds
u = sorted([x if x else "" for x in unet.cli_run_cmds]) u = sorted([x if x else "" for x in unet.cli_run_cmds])
@ -516,7 +515,6 @@ class Completer:
async def doline( async def doline(
unet, line, outf, background=False, notty=False unet, line, outf, background=False, notty=False
): # pylint: disable=R0911 ): # pylint: disable=R0911
line = line.strip() line = line.strip()
m = re.fullmatch(r"^(\S+)(?:\s+(.*))?$", line) m = re.fullmatch(r"^(\S+)(?:\s+(.*))?$", line)
if not m: if not m:
@ -670,7 +668,7 @@ async def cli_client(sockpath, prompt="munet> "):
rb = rb[: -len(ENDMARKER)] rb = rb[: -len(ENDMARKER)]
# Write the output # Write the output
sys.stdout.write(rb.decode("utf-8")) sys.stdout.write(rb.decode("utf-8", "ignore"))
async def local_cli(unet, outf, prompt, histfile, background): async def local_cli(unet, outf, prompt, histfile, background):
@ -729,7 +727,7 @@ async def cli_client_connected(unet, background, reader, writer):
self.writer = writer self.writer = writer
def write(self, x): def write(self, x):
self.writer.write(x.encode("utf-8")) self.writer.write(x.encode("utf-8", "ignore"))
def flush(self): def flush(self):
self.writer.flush() self.writer.flush()