diff options
| author | holger krekel <holger@merlinux.eu> | 2013-11-21 14:40:14 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2013-11-21 14:40:14 +0100 |
| commit | 2700a94d4940057e94ab76747a5a4986ade88726 (patch) | |
| tree | c69aa02fdf3a6fef6a2f30b31da2a3c2bdfe4705 /testing/test_conftest.py | |
| parent | e31f40c2d0d827cbbf7690d47128d41ee85d5962 (diff) | |
| download | pytest-2700a94d4940057e94ab76747a5a4986ade88726.tar.gz | |
remove an old duplicate marker and use recent pytest mechanism for parametrization
Diffstat (limited to 'testing/test_conftest.py')
| -rw-r--r-- | testing/test_conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py index c2d5ff1c6..9b5fa94e9 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -182,7 +182,7 @@ def test_setinitial_confcut(testdir): assert conftest.getconftestmodules(sub) == [] assert conftest.getconftestmodules(conf.dirpath()) == [] -@pytest.mark.multi(name='test tests whatever .dotdir'.split()) +@pytest.mark.parametrize("name", 'test tests whatever .dotdir'.split()) def test_setinitial_conftest_subdirs(testdir, name): sub = testdir.mkdir(name) subconftest = sub.ensure("conftest.py") |