summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Brady <lbrady@labn.net>2024-10-17 13:35:36 -0400
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-10-28 15:17:56 +0000
commit9a830b3cf4b8a6e707a0e3c0271df373fe5b184e (patch)
tree1c97886b81ca835a1af3cfa77835512d92fc0ea2
parentf4f0e2cd38d3b2c6110c42302c8efe46d8038ce5 (diff)
tests: logger masked in topotest.py
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)
-rw-r--r--tests/topotests/lib/topotest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index d15fefc039..bd98958355 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -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(