Content-Length: 7740 | pFad | http://github.com/postgrespro/testgres/pull/282.patch

thub.com From 62588c3a99be79682693097bc5a7cd272bafea66 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Tue, 8 Jul 2025 15:39:46 +0300 Subject: [PATCH] [tests] Creation of "dummy/empty" log file for xdist controller is fixed. This commit does the following things: 1) It detects a kind of process (master/worker) 2) It detects a mode of process (collect/exec) 3) It creates/configures a log file for worker/exec only 4) It uses pytest_sessionfinish hook instead run_after_tests fixture --- tests/conftest.py | 124 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index fbbd2d6..a0fd2da 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,6 +9,7 @@ import math import datetime import typing +import enum import _pytest.outcomes import _pytest.unittest @@ -39,6 +40,30 @@ g_critical_msg_count_key = pytest.StashKey[int]() +# //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// +# T_TEST_PROCESS_KIND + +class T_TEST_PROCESS_KIND(enum.Enum): + Master = 1 + Worker = 2 + + +# //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// +# T_TEST_PROCESS_MODE + +class T_TEST_PROCESS_MODE(enum.Enum): + Collect = 1 + ExecTests = 2 + + +# //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// + +g_test_process_kind: typing.Optional[T_TEST_PROCESS_KIND] = None +g_test_process_mode: typing.Optional[T_TEST_PROCESS_MODE] = None + +g_worker_log_is_created: typing.Optional[bool] = None + + # //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// # TestConfigPropNames @@ -857,13 +882,37 @@ def helper__print_test_list2(tests: typing.List[T_TUPLE__str_int]) -> None: # //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// +# SUMMARY BUILDER + + +@pytest.hookimpl(trylast=True) +def pytest_sessionfinish(): + # + # NOTE: It should execute after logging.pytest_sessionfinish + # + + global g_test_process_kind # noqa: F824 + global g_test_process_mode # noqa: F824 + global g_worker_log_is_created # noqa: F824 + assert g_test_process_kind is not None + assert type(g_test_process_kind) == T_TEST_PROCESS_KIND # noqa: E721 -@pytest.fixture(autouse=True, scope="session") -def run_after_tests(request: pytest.FixtureRequest): - assert isinstance(request, pytest.FixtureRequest) + if g_test_process_kind == T_TEST_PROCESS_KIND.Master: + return + + assert g_test_process_kind == T_TEST_PROCESS_KIND.Worker - yield + assert g_test_process_mode is not None + assert type(g_test_process_mode) == T_TEST_PROCESS_MODE # noqa: E721 + + if g_test_process_mode == T_TEST_PROCESS_MODE.Collect: + return + + assert g_test_process_mode == T_TEST_PROCESS_MODE.ExecTests + + assert type(g_worker_log_is_created) == bool # noqa: E721 + assert g_worker_log_is_created C_LINE1 = "---------------------------" @@ -975,8 +1024,33 @@ def LOCAL__print_test_list2( # //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com/// +def helper__detect_test_process_kind(config: pytest.Config) -> T_TEST_PROCESS_KIND: + assert isinstance(config, pytest.Config) + + # + # xdist' master process registers DSession plugin. + # + p = config.pluginmanager.get_plugin("dsession") + + if p is not None: + return T_TEST_PROCESS_KIND.Master + + return T_TEST_PROCESS_KIND.Worker + + +# ------------------------------------------------------------------------ +def helper__detect_test_process_mode(config: pytest.Config) -> T_TEST_PROCESS_MODE: + assert isinstance(config, pytest.Config) + + if config.getvalue("collectonly"): + return T_TEST_PROCESS_MODE.Collect + + return T_TEST_PROCESS_MODE.ExecTests + + +# ------------------------------------------------------------------------ @pytest.hookimpl(trylast=True) -def pytest_configure(config: pytest.Config) -> None: +def helper__pytest_configure__logging(config: pytest.Config) -> None: assert isinstance(config, pytest.Config) log_name = TestStartupData.GetCurrentTestWorkerSignature() @@ -993,7 +1067,45 @@ def pytest_configure(config: pytest.Config) -> None: assert logging_plugin is not None assert isinstance(logging_plugin, _pytest.logging.LoggingPlugin) - logging_plugin.set_log_path(os.path.join(log_dir, log_name)) + log_file_path = os.path.join(log_dir, log_name) + assert log_file_path is not None + assert type(log_file_path) == str # noqa: E721 + logging_plugin.set_log_path(log_file_path) + return + + +# ------------------------------------------------------------------------ +@pytest.hookimpl(trylast=True) +def pytest_configure(config: pytest.Config) -> None: + assert isinstance(config, pytest.Config) + + global g_test_process_kind + global g_test_process_mode + global g_worker_log_is_created + + assert g_test_process_kind is None + assert g_test_process_mode is None + assert g_worker_log_is_created is None + + g_test_process_mode = helper__detect_test_process_mode(config) + g_test_process_kind = helper__detect_test_process_kind(config) + + assert type(g_test_process_kind) == T_TEST_PROCESS_KIND # noqa: E721 + assert type(g_test_process_mode) == T_TEST_PROCESS_MODE # noqa: E721 + + if g_test_process_kind == T_TEST_PROCESS_KIND.Master: + pass + else: + assert g_test_process_kind == T_TEST_PROCESS_KIND.Worker + + if g_test_process_mode == T_TEST_PROCESS_MODE.Collect: + g_worker_log_is_created = False + else: + assert g_test_process_mode == T_TEST_PROCESS_MODE.ExecTests + helper__pytest_configure__logging(config) + g_worker_log_is_created = True + + return # //github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///github.com///

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!