floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

same param_index usage for markers params and fixtures params

This commit is contained in:
Aleksandr Brodin 2024-03-24 14:36:13 +07:00
parent 0b6028f748
commit 2718e9bced
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/python.py
View File

@ -1330,8 +1330,7 @@ class Metafunc:
for param_index, (param_id, param_set) in enumerate(
zip(ids, parametersets)
):
if name2pseudofixturedef:
param_index = callspec_index + param_index
param_index = callspec_index * len(parametersets) + param_index
newcallspec = callspec.setmulti(
argnames=argnames,
valset=param_set.values,

8
testing/python/fixtures.py
View File

@ -2690,12 +2690,12 @@ class TestFixtureMarker:
test_mod2.py::test_func2[s2] PASSED
test_mod2.py::test_func3[s2-m1] PASSED
test_mod2.py::test_func3b[s2-m1] PASSED
test_mod2.py::test_func4[m1] PASSED
test_mod2.py::test_func3[s2-m2] PASSED
test_mod2.py::test_func3b[s2-m2] PASSED
test_mod2.py::test_func4[m2] PASSED
test_mod1.py::test_func1[m1] PASSED
test_mod1.py::test_func1[m2] PASSED
test_mod2.py::test_func4[m1] PASSED
test_mod2.py::test_func4[m2] PASSED
"""
)
@ -2741,10 +2741,10 @@ class TestFixtureMarker:
test_dynamic_parametrized_ordering.py::test2[flavor1-vxlan] PASSED
test_dynamic_parametrized_ordering.py::test[flavor1-vlan] PASSED
test_dynamic_parametrized_ordering.py::test2[flavor1-vlan] PASSED
test_dynamic_parametrized_ordering.py::test[flavor2-vlan] PASSED
test_dynamic_parametrized_ordering.py::test2[flavor2-vlan] PASSED
test_dynamic_parametrized_ordering.py::test[flavor2-vxlan] PASSED
test_dynamic_parametrized_ordering.py::test2[flavor2-vxlan] PASSED
test_dynamic_parametrized_ordering.py::test[flavor2-vlan] PASSED
test_dynamic_parametrized_ordering.py::test2[flavor2-vlan] PASSED
"""
)

6
testing/python/metafunc.py
View File

@ -1024,7 +1024,7 @@ class TestMetafunc:
"""
import pytest
@pytest.mark.parametrize("arg2", ['a', 'b'], scope='class')
@pytest.mark.parametrize("arg2", ['a', 'b', 'c'], scope='class')
@pytest.mark.parametrize("arg1", [1, 2], scope='class')
class TestClass:
def test1(self, arg1, arg2):
@ -1041,10 +1041,14 @@ class TestMetafunc:
r" <Function test2\[1-a\]>",
r" <Function test1\[1-b\]>",
r" <Function test2\[1-b\]>",
r" <Function test1\[1-c\]>",
r" <Function test2\[1-c\]>",
r" <Function test1\[2-a\]>",
r" <Function test2\[2-a\]>",
r" <Function test1\[2-b\]>",
r" <Function test2\[2-b\]>",
r" <Function test1\[2-c\]>",
r" <Function test2\[2-c\]>",
]
)