6 files changed, 9 insertions, 9 deletions
diff --git a/tests/topotests/analyze.py b/tests/topotests/analyze.py
index 360c9cf1e..9c9bfda1e 100755
--- a/tests/topotests/analyze.py
+++ b/tests/topotests/analyze.py
@@ -161,6 +161,8 @@ def main():
             logging.critical('No "/tmp/topotests" directory to save')
             sys.exit(1)
         subprocess.run(["mv", "/tmp/topotests", args.results])
+        if "SUDO_USER" in os.environ:
+            subprocess.run(["chown", "-R", os.environ["SUDO_USER"], args.results])
         # # Old location for results
         # if os.path.exists("/tmp/topotests.xml", args.results):
         #     subprocess.run(["mv", "/tmp/topotests.xml", args.results])
diff --git a/tests/topotests/bgp_disable_addpath_rx/r1/bgpd.conf b/tests/topotests/bgp_disable_addpath_rx/r1/bgpd.conf
index af1353e0e..44b009e9c 100644
--- a/tests/topotests/bgp_disable_addpath_rx/r1/bgpd.conf
+++ b/tests/topotests/bgp_disable_addpath_rx/r1/bgpd.conf
@@ -1,6 +1,6 @@
 !
 router bgp 65001
- timers 3 10
+ timers bgp 3 10
  no bgp ebgp-requires-policy
  neighbor 192.168.1.2 remote-as external
  neighbor 192.168.1.2 timers connect 5
diff --git a/tests/topotests/bgp_disable_addpath_rx/r2/bgpd.conf b/tests/topotests/bgp_disable_addpath_rx/r2/bgpd.conf
index db68e554d..8274e3f96 100644
--- a/tests/topotests/bgp_disable_addpath_rx/r2/bgpd.conf
+++ b/tests/topotests/bgp_disable_addpath_rx/r2/bgpd.conf
@@ -1,5 +1,5 @@
 router bgp 65002
- timers 3 10
+ timers bgp 3 10
  no bgp ebgp-requires-policy
  neighbor 192.168.1.1 remote-as external
  neighbor 192.168.1.1 timers connect 5
diff --git a/tests/topotests/bgp_disable_addpath_rx/r3/bgpd.conf b/tests/topotests/bgp_disable_addpath_rx/r3/bgpd.conf
index 3ac6a08e4..98eb2e171 100644
--- a/tests/topotests/bgp_disable_addpath_rx/r3/bgpd.conf
+++ b/tests/topotests/bgp_disable_addpath_rx/r3/bgpd.conf
@@ -1,5 +1,5 @@
 router bgp 65003
- timers 3 10
+ timers bgp 3 10
  no bgp ebgp-requires-policy
  neighbor 192.168.2.2 remote-as external
  neighbor 192.168.2.2 timers connect 5
diff --git a/tests/topotests/bgp_disable_addpath_rx/r4/bgpd.conf b/tests/topotests/bgp_disable_addpath_rx/r4/bgpd.conf
index 8ab405fbd..68245c4a2 100644
--- a/tests/topotests/bgp_disable_addpath_rx/r4/bgpd.conf
+++ b/tests/topotests/bgp_disable_addpath_rx/r4/bgpd.conf
@@ -1,5 +1,5 @@
 router bgp 65004
- timers 3 10
+ timers bgp 3 10
  no bgp ebgp-requires-policy
  neighbor 192.168.2.2 remote-as external
  neighbor 192.168.2.2 timers connect 5
diff --git a/tests/topotests/munet/cli.py b/tests/topotests/munet/cli.py
index f58ea99d6..f631073bb 100644
--- a/tests/topotests/munet/cli.py
+++ b/tests/topotests/munet/cli.py
@@ -93,7 +93,7 @@ def spawn(unet, host, cmd, iow, ns_only):
             elif master_fd in r:
                 o = os.read(master_fd, 10240)
                 if o:
-                    iow.write(o.decode("utf-8"))
+                    iow.write(o.decode("utf-8", "ignore"))
                     iow.flush()
     finally:
         # restore tty settings back
@@ -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()