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

Merge pull request #13495 from LabNConsulting/chopps/munet-0.13.3

Browse Source 
tests: update to munet 0.13.3, restoring GNU screen functionality
This commit is contained in:
Jafar Al-Gharaibeh 2023-05-10 15:05:47 -05:00 committed by GitHub
commit 45df6ff3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,7 +273,7 @@ ff02::2\tip6-allrouters
shellopt = self.cfgopt.get_option_list("--shell")
if "all" in shellopt or "." in shellopt:
self.run_in_window("bash")
self.run_in_window("bash", title="munet")
# This is expected by newer munet CLI code
self.config_dirname = ""

10
tests/topotests/munet/base.py
View File

@ -1241,9 +1241,13 @@ class Commander: # pylint: disable=R0904
# XXX not appropriate for ssh
cmd = ["sudo", "-Eu", os.environ["SUDO_USER"]] + cmd
if not isinstance(nscmd, str):
nscmd = shlex.join(nscmd)
cmd.append(nscmd)
if title:
cmd.append("-t")
cmd.append(title)
if isinstance(nscmd, str):
nscmd = shlex.split(nscmd)
cmd.extend(nscmd)
elif "DISPLAY" in os.environ:
cmd = [get_exec_path_host("xterm")]
if "SUDO_USER" in os.environ: