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

Improve output when parsing an ini configuration fails

This commit is contained in:
Florian Bruhin 2019-07-23 15:24:22 +02:00
parent 693e9d0733
commit 8c47db724c
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/5650.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Improved output when parsing an ini configuration file fails.

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

@ -32,7 +32,11 @@ def getcfg(args, config=None):
for inibasename in inibasenames: for inibasename in inibasenames:
p = base.join(inibasename) p = base.join(inibasename)
if exists(p): if exists(p):
try:
iniconfig = py.iniconfig.IniConfig(p) iniconfig = py.iniconfig.IniConfig(p)
except py.iniconfig.ParseError as exc:
raise UsageError(str(exc))
if ( if (
inibasename == "setup.cfg" inibasename == "setup.cfg"
and "tool:pytest" in iniconfig.sections and "tool:pytest" in iniconfig.sections

8
testing/test_config.py
View File

@ -122,6 +122,14 @@ class TestParseIni:
config = testdir.parseconfigure(sub) config = testdir.parseconfigure(sub)
assert config.getini("minversion") == "2.0" assert config.getini("minversion") == "2.0"
def test_ini_parse_error(self, testdir):
testdir.tmpdir.join("pytest.ini").write('addopts = -x')
result = testdir.runpytest()
assert result.ret != 0
result.stderr.fnmatch_lines([
"ERROR: *pytest.ini:1: no section header defined"
])
@pytest.mark.xfail(reason="probably not needed") @pytest.mark.xfail(reason="probably not needed")
def test_confcutdir(self, testdir): def test_confcutdir(self, testdir):
sub = testdir.mkdir("sub") sub = testdir.mkdir("sub")