Move log outside ophyd_async/core

bluesky · May 3, 2024 · ee2f3c3 · ee2f3c3
1 parent 78426b2
commit ee2f3c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/ophyd_async/core/log.py → src/ophyd_async/log.py b/src/ophyd_async/core/log.py → src/ophyd_async/log.py
diff --git a/tests/core/test_log.py → tests/test_log.py b/tests/core/test_log.py → tests/test_log.py
@@ -5,8 +5,9 @@
 
 import pytest
 
-from ophyd_async.core import Device, log
-from ophyd_async.core.log import DEFAULT_DATE_FORMAT, DEFAULT_FORMAT
+from ophyd_async import log
+from ophyd_async.core import Device
+from ophyd_async.log import DEFAULT_DATE_FORMAT, DEFAULT_FORMAT
 
 
 def test_validate_level():
@@ -21,17 +22,17 @@ def test_validate_level():
         log._validate_level("MYSTERY")
 
 
-@patch("ophyd_async.core.log.current_handler")
-@patch("ophyd_async.core.log.logging.Logger.addHandler")
+@patch("ophyd_async.log.current_handler")
+@patch("ophyd_async.log.logging.Logger.addHandler")
 def test_default_config_ophyd_async_logging(mock_add_handler, mock_current_handler):
     log.config_ophyd_async_logging()
     assert isinstance(log.current_handler, logging.StreamHandler)
     assert log.logger.getEffectiveLevel() <= logging.WARNING
 
 
-@patch("ophyd_async.core.log.current_handler")
-@patch("ophyd_async.core.log.logging.FileHandler")
-@patch("ophyd_async.core.log.logging.Logger.addHandler")
+@patch("ophyd_async.log.current_handler")
+@patch("ophyd_async.log.logging.FileHandler")
+@patch("ophyd_async.log.logging.Logger.addHandler")
 def test_config_ophyd_async_logging_with_file_handler(
     mock_add_handler, mock_file_handler, mock_current_handler
 ):
@@ -40,7 +41,7 @@ def test_config_ophyd_async_logging_with_file_handler(
     assert log.logger.getEffectiveLevel() <= logging.WARNING
 
 
-@patch("ophyd_async.core.log.current_handler")
+@patch("ophyd_async.log.current_handler")
 def test_config_ophyd_async_logging_removes_extra_handlers(mock_current_handler):
     # Protect global variable in other pytests
     class FakeLogger:
@@ -57,7 +58,7 @@ def getEffectiveLevel(self):
 
     fake_logger = FakeLogger()
     with (
-        patch("ophyd_async.core.log.logger", fake_logger),
+        patch("ophyd_async.log.logger", fake_logger),
     ):
         log.config_ophyd_async_logging()
         fake_logger.removeHandler.assert_not_called()