p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in eks/pytest/issue616 (pull request #258) 

Add comments
This commit is contained in:
Ronny Pfannschmidt 2015-03-02 14:38:10 +01:00
parent bae0f7f46a 97d5da5c99
commit 41e6b04f0b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/test_conftest.py
View File

@ -312,21 +312,25 @@ class TestConftestVisibility:
# N.B.: "swc" stands for "subdir with conftest.py" # N.B.: "swc" stands for "subdir with conftest.py"
# "snc" stands for "subdir no [i.e. without] conftest.py" # "snc" stands for "subdir no [i.e. without] conftest.py"
@pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [ @pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [
# Effective target: package/..
("runner", "..", 3), ("runner", "..", 3),
("package", "..", 3), ("package", "..", 3),
("swc", "../..", 3), ("swc", "../..", 3),
("snc", "../..", 3), ("snc", "../..", 3),
# Effective target: package
("runner", "../package", 3), ("runner", "../package", 3),
("package", ".", 3), ("package", ".", 3),
("swc", "..", 3), ("swc", "..", 3),
("snc", "..", 3), ("snc", "..", 3),
# Effective target: package/swc
("runner", "../package/swc", 1), ("runner", "../package/swc", 1),
("package", "./swc", 1), ("package", "./swc", 1),
("swc", ".", 1), ("swc", ".", 1),
("snc", "../swc", 1), ("snc", "../swc", 1),
# Effective target: package/snc
("runner", "../package/snc", 1), ("runner", "../package/snc", 1),
("package", "./snc", 1), ("package", "./snc", 1),
("swc", "../snc", 1), ("swc", "../snc", 1),