Skip to content

Commit

Permalink
Name squash/collect parameters for collect tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ZedThree committed Jul 31, 2024
1 parent 58b65e4 commit e55bb71
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/boutdata/tests/test_collect.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
# Note - using tmp_path fixture requires pytest>=3.9.0

collect_kwargs_list = [
{"xguards": True, "yguards": "include_upper"},
{"xguards": False, "yguards": False},
pytest.param({"xguards": True, "yguards": "include_upper"}, id="collect_guards"),
pytest.param({"xguards": False, "yguards": False}, id="collect_noguards"),
]

collect_kwargs_list_full = [
Expand All @@ -39,9 +39,9 @@


squash_params_list = [
(False, {}),
(True, {}),
(True, {"parallel": 2}),
pytest.param((False, {}), id="squash_off"),
pytest.param((True, {}), id="squash_serial"),
pytest.param((True, {"parallel": 2}), id="squash_parallel"),
]


Expand Down Expand Up @@ -789,7 +789,7 @@ class TestCollect:
@pytest.mark.parametrize("collect_kwargs", collect_kwargs_list)
@pytest.mark.parametrize("scenario", scenario_list)
def test_tokamak_scenario_collect(
tmp_path, scenario, collect_kwargs, squash_params, request
self, tmp_path, scenario, collect_kwargs, squash_params, request
):
"""Test basic collect in different scenarios"""
squash, squash_kwargs = squash_params
Expand Down

0 comments on commit e55bb71

Please sign in to comment.