Skip to content

Commit cd6e565

Browse files
authored
remove duplicate tests (#24)
In some cases `new_cmds == legacy_cmds`. This made it more verbose to write and additionally resulted in duplicate tests. After this PR, if no `legacy_cmds` is passed to `Config`, the value of `new_cmds` is used. Plus, duplicate configs are filtered out.
1 parent 6f8e524 commit cd6e565

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

tests/test_plugin.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ def test_standard_collection(collect_tests, file, cmds, selection):
7777
@make_parametrization(
7878
Config(
7979
new_cmds=("-k", "cpu"),
80-
legacy_cmds=("-k", "cpu"),
8180
selection=(
8281
"::TestFooCPU::test_bar_cpu",
8382
"::TestFooCPU::test_baz_cpu",
@@ -88,7 +87,6 @@ def test_standard_collection(collect_tests, file, cmds, selection):
8887
),
8988
Config(
9089
new_cmds=("-k", "meta"),
91-
legacy_cmds=("-k", "meta"),
9290
selection=(
9391
"::TestFooMETA::test_bar_meta",
9492
"::TestFooMETA::test_baz_meta",
@@ -106,15 +104,13 @@ def test_devices(collect_tests, file, cmds, selection):
106104
@make_parametrization(
107105
Config(
108106
new_cmds=("-k", "float16"),
109-
legacy_cmds=("-k", "float16"),
110107
selection=(
111108
"::TestFooCPU::test_bar_cpu_float16",
112109
"::TestFooCPU::test_bar_cpu_float16",
113110
),
114111
),
115112
Config(
116113
new_cmds=("-k", "int32"),
117-
legacy_cmds=("-k", "int32"),
118114
selection=(
119115
"::TestFooCPU::test_bar_cpu_int32",
120116
"::TestFooCPU::test_bar_cpu_int32",
@@ -130,15 +126,13 @@ def test_dtypes(collect_tests, file, cmds, selection):
130126
@make_parametrization(
131127
Config(
132128
new_cmds=("-k", "add"),
133-
legacy_cmds=("-k", "add"),
134129
selection=(
135130
"::TestFooCPU::test_bar_add_cpu_float32",
136131
"::TestFooCPU::test_bar_add_with_alpha_cpu_float32",
137132
),
138133
),
139134
Config(
140135
new_cmds=("-k", "sub"),
141-
legacy_cmds=("-k", "sub"),
142136
selection=(
143137
"::TestFooCPU::test_bar_sub_cpu_float32",
144138
"::TestFooCPU::test_bar_sub_with_alpha_cpu_float32",

tests/utils.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ def __init__(
1414
*,
1515
file: Optional[str] = None,
1616
new_cmds: Union[str, Sequence[str]] = (),
17-
legacy_cmds: Union[str, Sequence[str]] = (),
17+
legacy_cmds: Optional[Union[str, Sequence[str]]] = None,
1818
selection: Collection[str],
1919
):
2020
self._file = file
2121
self._new_cmds = new_cmds
22+
if legacy_cmds is None:
23+
legacy_cmds = new_cmds
2224
self._legacy_cmds = legacy_cmds
2325
self._selection = selection
2426

@@ -46,21 +48,25 @@ def make_params(self, file: Optional[str] = None) -> Tuple[ParameterSet, ...]:
4648
new_cmds = self._parse_cmds(self._new_cmds, file)
4749
legacy_cmds = self._parse_cmds(self._legacy_cmds, file)
4850
selection = self._parse_selection(self._selection, file)
49-
return (
50-
pytest.param(
51-
file,
52-
new_cmds,
53-
selection,
54-
id=self._cmds_to_id(new_cmds),
55-
),
56-
pytest.param(
57-
file,
58-
legacy_cmds,
59-
selection,
60-
id=self._cmds_to_id(legacy_cmds),
61-
),
51+
52+
new_params = pytest.param(
53+
file,
54+
new_cmds,
55+
selection,
56+
id=self._cmds_to_id(new_cmds),
57+
)
58+
if new_cmds == legacy_cmds:
59+
return (new_params,)
60+
61+
legacy_cmds = pytest.param(
62+
file,
63+
legacy_cmds,
64+
selection,
65+
id=self._cmds_to_id(legacy_cmds),
6266
)
6367

68+
return (new_params, legacy_cmds)
69+
6470

6571
def make_params(*configs: Config, file: Optional[str] = None) -> List[ParameterSet]:
6672
return [param for config in configs for param in config.make_params(file)]

0 commit comments

Comments
 (0)