Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #15166 from LabNConsulting/chopps/fix-munet

Browse source 
tests: fix munet accessing missing attribute
This commit is contained in:
Donatas Abraitis 2024-01-18 09:18:04 +02:00 committed by GitHub
parent 5eb2ddaa10 a197107dbc
commit 94178edac3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/topotests/munet/base.py
View file

@ -21,7 +21,6 @@ import subprocess
import sys
import tempfile
import time as time_mod
from collections import defaultdict
from pathlib import Path
from typing import Union
@ -29,10 +28,8 @@ from typing import Union
from . import config as munet_config
from . import linux
try:
import pexpect
from pexpect.fdpexpect import fdspawn
from pexpect.popen_spawn import PopenSpawn
@ -1237,7 +1234,7 @@ class Commander: # pylint: disable=R0904
envvars = f"MUNET_NODENAME={self.name} NODENAME={self.name}"
if hasattr(self, "rundir"):
envvars += f" RUNDIR={self.rundir}"
if self.unet.config_dirname:
if hasattr(self.unet, "config_dirname") and self.unet.config_dirname:
envvars += f" CONFIGDIR={self.unet.config_dirname}"
elif "CONFIGDIR" in os.environ:
envvars += f" CONFIGDIR={os.environ['CONFIGDIR']}"