From 1331735019d543c661e06f592c7cef14f4163382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Berland?= Date: Wed, 10 Jan 2024 15:15:44 +0100 Subject: [PATCH] Ensure consistent log levels in integration tests Some tests were moved from unit_tests to integration_tests in /a810eb0f8715e182d4e1b1dc1636356b97023711 that depend on log level details. This dependency was not triggered in Github actions workflows but in komodo bleeding nightly tests. --- tests/conftest.py | 13 +++++++++++++ tests/unit_tests/conftest.py | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6cbdc9c359a..413b83ebd01 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,6 @@ import asyncio import fileinput +import logging import os import pkgutil import resource @@ -30,6 +31,18 @@ from importlib.abc import FileLoader +@pytest.fixture(autouse=True) +def log_check(): + logger = logging.getLogger() + logger.setLevel(logging.WARNING) + yield + logger_after = logging.getLogger() + level_after = logger_after.getEffectiveLevel() + assert ( + level_after == logging.WARNING + ), f"Detected differences in log environment: Changed to {level_after}" + + @pytest.fixture def _qt_add_search_paths(qapp): "Ensure that icons and such are found by the tests" diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py index d4c23f87484..b73266e3acc 100644 --- a/tests/unit_tests/conftest.py +++ b/tests/unit_tests/conftest.py @@ -1,4 +1,3 @@ -import logging import os import sys @@ -7,18 +6,6 @@ from ert.ensemble_evaluator.config import EvaluatorServerConfig -@pytest.fixture(autouse=True) -def log_check(): - logger = logging.getLogger() - logger.setLevel(logging.WARNING) - yield - logger_after = logging.getLogger() - level_after = logger_after.getEffectiveLevel() - assert ( - level_after == logging.WARNING - ), f"Detected differences in log environment: Changed to {level_after}" - - @pytest.fixture(autouse=True) def no_cert_in_test(monkeypatch): # Do not generate certificates during test, parts of it can be time