summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2023-05-20 05:16:39 +0200
committerChristian Hopps <chopps@labn.net>2023-05-20 05:16:39 +0200
commit2013c684d0a73710c1a65e37b9090d03a40e62bc (patch)
treee3bc90a2980f432d60a5d9a5923bda2d994ecdf4
parentMerge pull request #13559 from opensourcerouting/fix/ignore_decoding_chars (diff)
downloadfrr-2013c684d0a73710c1a65e37b9090d03a40e62bc.tar.xz
frr-2013c684d0a73710c1a65e37b9090d03a40e62bc.zip
tests: munet to version 0.13.4
Signed-off-by: Christian Hopps <chopps@labn.net>
-rw-r--r--tests/topotests/munet/cli.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/topotests/munet/cli.py b/tests/topotests/munet/cli.py
index fc88dc320..f631073bb 100644
--- a/tests/topotests/munet/cli.py
+++ b/tests/topotests/munet/cli.py
@@ -281,7 +281,6 @@ async def async_input(prompt, histfile):
def make_help_str(unet):
-
w = sorted([x if x else "" for x in unet.cli_in_window_cmds])
ww = unet.cli_in_window_cmds
u = sorted([x if x else "" for x in unet.cli_run_cmds])
@@ -516,7 +515,6 @@ class Completer:
async def doline(
unet, line, outf, background=False, notty=False
): # pylint: disable=R0911
-
line = line.strip()
m = re.fullmatch(r"^(\S+)(?:\s+(.*))?$", line)
if not m:
@@ -670,7 +668,7 @@ async def cli_client(sockpath, prompt="munet> "):
rb = rb[: -len(ENDMARKER)]
# 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):
@@ -729,7 +727,7 @@ async def cli_client_connected(unet, background, reader, writer):
self.writer = writer
def write(self, x):
- self.writer.write(x.encode("utf-8"))
+ self.writer.write(x.encode("utf-8", "ignore"))
def flush(self):
self.writer.flush()