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

setup.cfg: use existing [tool:pytest] (ignoring [pytest])

Browse Source
This commit is contained in:
Daniel Hahler
2019-03-28 00:27:23 +01:00
parent 6b5cddc48a
commit bfda2a0050
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/_pytest/config/findpaths.py
View File

@@ -33,7 +33,12 @@ def getcfg(args, config=None):
p = base.join(inibasename)
if exists(p):
iniconfig = py.iniconfig.IniConfig(p)
if "pytest" in iniconfig.sections:
if (
inibasename == "setup.cfg"
and "tool:pytest" in iniconfig.sections
):
return base, p, iniconfig["tool:pytest"]
elif "pytest" in iniconfig.sections:
if inibasename == "setup.cfg" and config is not None:
fail(
@@ -41,11 +46,6 @@ def getcfg(args, config=None):
pytrace=False,
)
return base, p, iniconfig["pytest"]
if (
inibasename == "setup.cfg"
and "tool:pytest" in iniconfig.sections
):
return base, p, iniconfig["tool:pytest"]
elif inibasename == "pytest.ini":
# allowed to be empty
return base, p, {}