From 87533b6936afba07fbe78dd3e8cd795221167131 Mon Sep 17 00:00:00 2001 From: Sunghyun Cho Date: Wed, 10 Jun 2026 18:38:50 +0900 Subject: [PATCH] Make ENIP tests tolerate missing root log handlers Configure default logging in parser and UDT tests when pytest has not installed a root handler yet. This keeps the existing tests collectable on Python 2 with pytest 4. --- server/enip/parser_test.py | 2 ++ server/enip/udt_test.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/server/enip/parser_test.py b/server/enip/parser_test.py index 1ff105d..0aa76f8 100644 --- a/server/enip/parser_test.py +++ b/server/enip/parser_test.py @@ -20,6 +20,8 @@ # Set up logging to use our log format (instead of default Pytest format), while # retaining any logging level eg. python -m pytest --log-cli-level=25 ... +if not logging.getLogger().handlers: + logging.basicConfig( **log_cfg ) logging.getLogger().handlers[0].setFormatter( logging.Formatter( log_cfg['format'] )) diff --git a/server/enip/udt_test.py b/server/enip/udt_test.py index 7da4723..cb1a15f 100644 --- a/server/enip/udt_test.py +++ b/server/enip/udt_test.py @@ -20,6 +20,8 @@ # Set up logging to use our log format (instead of default Pytest format), while # retaining any logging level eg. python -m pytest --log-cli-level=25 ... +if not logging.getLogger().handlers: + logging.basicConfig( **log_cfg ) logging.getLogger().handlers[0].setFormatter( logging.Formatter( log_cfg['format'] )) try: