Skip to content

Commit fee4052

Browse files
committed
refactor: use proper typed logging functions in pytest hooks
Signed-off-by: Rainer Poisel <[email protected]>
1 parent 8f63a1e commit fee4052

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

labgrid/pytestplugin/hooks.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,23 @@ def set_cli_log_level(level: int) -> None:
2727
print(f"current_level: {current_level}")
2828

2929
if isinstance(current_level, str):
30+
s = current_level.strip()
3031
try:
31-
current_level = int(logging.getLevelName(current_level))
32+
current_level_val: Optional[int] = int(s)
3233
except ValueError:
33-
current_level = None
34-
assert current_level is None or isinstance(current_level, int), "unexpected type of current log level"
34+
v = logging.getLevelName(s.upper())
35+
current_level_val = v if isinstance(v, int) else None
36+
elif isinstance(current_level, int):
37+
current_level_val = current_level
38+
else:
39+
current_level_val = None
40+
41+
assert current_level_val is None or isinstance(current_level_val, int), \
42+
"unexpected type of current log level"
3543

3644
# If no level was set previously (via ini or cli) or current_level is
3745
# less verbose than level, set to new level.
38-
if current_level is None or level < current_level:
46+
if current_level_val is None or level < current_level_val:
3947
config.option.log_cli_level = str(level)
4048

4149
verbosity = config.getoption("verbose")

0 commit comments

Comments
 (0)