]> git.puffer.fish Git - matthieu/frr.git/commitdiff
tests: logger masked in topotest.py
authorLiam Brady <lbrady@labn.net>
Thu, 17 Oct 2024 17:35:36 +0000 (13:35 -0400)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Mon, 28 Oct 2024 15:17:56 +0000 (15:17 +0000)
a local logger masks the global logger and prevents errors from being
gracefully handled within topotest.py

Signed-off-by: Liam Brady <lbrady@labn.net>
(cherry picked from commit 1b38f3304170d7a57715aab0607317eba0698d39)

tests/topotests/lib/topotest.py

index d15fefc0390e98f454c4620b77fe0c0e66aa75a8..bd989583553d25e1a742168365a0f7d19b8dead2 100644 (file)
@@ -1244,8 +1244,8 @@ def _sysctl_assure(commander, variable, value):
 def sysctl_atleast(commander, variable, min_value, raises=False):
     try:
         if commander is None:
-            logger = logging.getLogger("topotest")
-            commander = micronet.Commander("sysctl", logger=logger)
+            topotest_logger = logging.getLogger("topotest")
+            commander = micronet.Commander("sysctl", logger=topotest_logger)
 
         return _sysctl_atleast(commander, variable, min_value)
     except subprocess.CalledProcessError as error:
@@ -1262,8 +1262,8 @@ def sysctl_atleast(commander, variable, min_value, raises=False):
 def sysctl_assure(commander, variable, value, raises=False):
     try:
         if commander is None:
-            logger = logging.getLogger("topotest")
-            commander = micronet.Commander("sysctl", logger=logger)
+            topotest_logger = logging.getLogger("topotest")
+            commander = micronet.Commander("sysctl", logger=topotest_logger)
         return _sysctl_assure(commander, variable, value)
     except subprocess.CalledProcessError as error:
         logger.warning(