test: adjust unit tests

Author: sgoral-splunk

solnlib/conf_manager.py

@@ -41,7 +41,6 @@
 logger = get_solnlib_logger(__name__)
 
 
-
 __all__ = [
     "ConfFile",
     "ConfManager",

solnlib/file_monitor.py

@@ -29,8 +29,6 @@
 logger = get_solnlib_logger(__name__)
 
 
-
-
 __all__ = ["FileChangesChecker", "FileMonitor"]
 
 

solnlib/timer_queue.py

@@ -25,9 +25,9 @@
 
 import sortedcontainers as sc
 
-from solnlib.log import Logs
-
+from solnlib.utils import get_solnlib_logger
 
+logger = get_solnlib_logger(__name__)
 
 
 __all__ = ["Timer", "TimerQueueStruct", "TimerQueue"]
@@ -193,8 +193,7 @@ def check_and_execute(self) -> float:
             try:
                 timer()
             except Exception:
-                logging.error(traceback.format_exc())
-                logger = Logs().get_logger(__name__)# deprecated
+                logging.error(traceback.format_exc())  # deprecated
                 logger.error(traceback.format_exc())
 
         self.reset_timers(expired_timers)
@@ -242,7 +241,6 @@ def start(self):
         self._started = True
 
         self._thr.start()
-        logger = Logs().get_logger(__name__)
         logger.info("TimerQueue started.")
 
     def stop(self):
@@ -296,8 +294,7 @@ def _check_and_execute(self):
                     # Note, please make timer callback effective/short
                     timer()
                 except Exception:
-                    logging.error(traceback.format_exc())
-                    logger = Logs().get_logger(__name__)# deprecated
+                    logging.error(traceback.format_exc())  # deprecated
                     logger.error(traceback.format_exc())
 
             self._reset_timers(expired_timers)

solnlib/utils.py

@@ -30,6 +30,7 @@
 
 
 __all__ = [
+    "get_solnlib_logger",
     "handle_teardown_signals",
     "datetime_to_seconds",
     "is_true",
@@ -232,4 +233,5 @@ def logger():
         if _logger is None:
             _logger = Logs().get_logger(name)
         return _logger
-    return logger
+
+    return logger

tests/integration/test_user_access.py

@@ -18,7 +18,6 @@
 import conftest
 import os.path as op
 import sys
-from unittest import mock
 import pytest
 
 from solnlib import user_access