From e55bb71b2b8886a9f2322f7c501be8c43d5d1045 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Wed, 31 Jul 2024 17:04:28 +0100 Subject: [PATCH] Name squash/collect parameters for collect tests --- src/boutdata/tests/test_collect.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/boutdata/tests/test_collect.py b/src/boutdata/tests/test_collect.py index 8935bc1..e668253 100644 --- a/src/boutdata/tests/test_collect.py +++ b/src/boutdata/tests/test_collect.py @@ -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 = [ @@ -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"), ] @@ -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