From 15575ad1fdb0d6ccbe02c2078c534e59c5f6716a Mon Sep 17 00:00:00 2001 From: Jonathan Karlsen Date: Fri, 31 Jan 2025 12:00:23 +0100 Subject: [PATCH] Fix everest fixture for caching testcase results --- tests/everest/conftest.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/everest/conftest.py b/tests/everest/conftest.py index 41ef76c3e75..e8f40e08879 100644 --- a/tests/everest/conftest.py +++ b/tests/everest/conftest.py @@ -157,11 +157,17 @@ def create_evaluator_server_config(run_model): @pytest.fixture -def cached_example(pytestconfig, evaluator_server_config_generator): +def cached_example(pytestconfig: pytest.Config, evaluator_server_config_generator): cache = pytestconfig.cache def run_config(test_data_case: str): - if cache.get(f"cached_example:{test_data_case}", None) is None: + if ( + cache.get( + f"cached_example:{test_data_case}:{os.environ.get('PYTEST_XDIST_WORKER', '')}", + None, + ) + is None + ): my_tmpdir = Path(tempfile.mkdtemp()) config_path = ( Path(__file__) / f"../../../test-data/everest/{test_data_case}" @@ -187,12 +193,13 @@ def run_config(test_data_case: str): } cache.set( - f"cached_example:{test_data_case}", + f"cached_example:{test_data_case}:{os.environ.get('PYTEST_XDIST_WORKER', '')}", (str(result_path), config_file, optimal_result_json), ) result_path, config_file, optimal_result_json = cache.get( - f"cached_example:{test_data_case}", (None, None, None) + f"cached_example:{test_data_case}:{os.environ.get('PYTEST_XDIST_WORKER', '')}", + (None, None, None), ) copied_tmpdir = tempfile.mkdtemp()