Skip to content

Commit e63456a

Browse files
Create fixture for logging
1 parent ba7dfe8 commit e63456a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/daq_config_server/log.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@ def set_up_logging(logging_config: LoggingConfig) -> None:
6868

6969
logger.setLevel(logging_config.level)
7070

71+
set_up_stream_handler(logger, logging_config)
72+
7173
if logging_config.graylog.enabled:
7274
set_up_graylog_handler(logger, logging_config)

tests/unit_tests/conftest.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pytest
44
from pytest import FixtureRequest
55

6+
from daq_config_server.log import GraylogConfig, LoggingConfig, set_up_logging
67
from daq_config_server.testing._utils import make_test_response
78
from daq_config_server.whitelist import get_whitelist
89
from tests.constants import TEST_WHITELIST_RESPONSE
@@ -27,3 +28,12 @@ def test_friendly_whitelist(request: FixtureRequest):
2728
yield
2829

2930
get_whitelist.cache_clear()
31+
32+
33+
TestLogConfig = LoggingConfig(graylog=GraylogConfig(enabled=False))
34+
35+
36+
@pytest.fixture(autouse=True)
37+
def test_friendly_logger():
38+
# Make sure we don't post to Graylog when running tests
39+
set_up_logging(TestLogConfig)

0 commit comments

Comments
 (0)