|
5 | 5 | - Command line options --include-local and --datasets for dataset selection |
6 | 6 | - Fixtures for accessing dataset information |
7 | 7 | - @pytest.mark.use_discovered_datasets for dynamic dataset parametrization |
8 | | -- Helper functions for parallel test execution with xdist_group markers |
9 | 8 | - require_dynamodb() and require_s3() helpers for failing fast when services are unavailable |
10 | 9 | - Session-scoped conversation cache for efficient test execution |
11 | 10 | """ |
@@ -148,36 +147,25 @@ def _get(dataset_name: str) -> dict: |
148 | 147 |
|
149 | 148 |
|
150 | 149 | # ============================================================================= |
151 | | -# Parallel Execution Helpers |
| 150 | +# Dataset Parametrization Helpers |
152 | 151 | # ============================================================================= |
153 | 152 |
|
154 | 153 | def make_dataset_params(datasets: list[str]) -> list: |
155 | 154 | """ |
156 | | - Create pytest.param objects with xdist_group markers for parallel execution. |
157 | | -
|
158 | | - When using pytest-xdist with --dist=loadgroup, tests with the same |
159 | | - xdist_group marker will run on the same worker. This ensures fixtures |
160 | | - are computed only once per dataset per worker. |
| 155 | + Create pytest.param objects for dataset parametrization. |
161 | 156 |
|
162 | 157 | Args: |
163 | 158 | datasets: List of dataset names (or "dataset-blob_type" composite IDs) |
164 | 159 |
|
165 | 160 | Returns: |
166 | | - List of pytest.param objects with xdist_group markers |
| 161 | + List of pytest.param objects |
167 | 162 |
|
168 | 163 | Example: |
169 | 164 | @pytest.mark.parametrize("dataset_name", make_dataset_params(["biodiversity", "vw"])) |
170 | 165 | def test_something(dataset_name): |
171 | 166 | ... |
172 | 167 | """ |
173 | | - # Uses the full composite ID (e.g., 'biodiversity-incremental') as the group |
174 | | - # key, so blob variants of the same dataset may land on different workers. |
175 | | - # This is intentional: once incremental blob processing is implemented, each |
176 | | - # variant will run a different computation, so cross-variant caching won't help. |
177 | | - return [ |
178 | | - pytest.param(ds, marks=pytest.mark.xdist_group(ds)) |
179 | | - for ds in datasets |
180 | | - ] |
| 168 | + return [pytest.param(ds) for ds in datasets] |
181 | 169 |
|
182 | 170 |
|
183 | 171 | def parse_dataset_blob_id(composite_id: str) -> tuple[str, str]: |
@@ -272,7 +260,7 @@ def pytest_generate_tests(metafunc): |
272 | 260 | With use_blobs=True, parametrize with 'dataset-blob_type' composite IDs |
273 | 261 | (e.g., 'biodiversity-incremental', 'engage-cold_start') for each filled blob variant. |
274 | 262 |
|
275 | | - Uses xdist_group markers for efficient parallel execution with pytest-xdist. |
| 263 | + Uses the session-scoped conversation cache for efficient test execution. |
276 | 264 | """ |
277 | 265 | markers = list(metafunc.definition.iter_markers("use_discovered_datasets")) |
278 | 266 | if not markers: |
|
0 commit comments