summaryrefslogtreecommitdiff
path: root/testing/test_config.py
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-08-02 16:20:21 +0200
committerDaniel Hahler <git@thequod.de>2019-08-02 16:52:51 +0200
commitb5b710b3ae26c6fcc257ace8db94c0ca54340c4e (patch)
treeb55991e233614d50f2af661e18a9faf9f165a22b /testing/test_config.py
parent4abf95ba4fe566ef6deb8ef49e3e82cc22fa9252 (diff)
parent0d3958e8dec5f78ed19ba5bc7a00a35f3ea3deb0 (diff)
downloadpytest-b5b710b3ae26c6fcc257ace8db94c0ca54340c4e.tar.gz
Merge master into features
Several conflicts, mostly due to 2c402f4bd. Conflicts: .pre-commit-config.yaml src/_pytest/outcomes.py src/_pytest/python_api.py tox.ini
Diffstat (limited to 'testing/test_config.py')
-rw-r--r--testing/test_config.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/testing/test_config.py b/testing/test_config.py
index 143cb90d1..fc3659d2a 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -123,6 +123,12 @@ class TestParseIni:
config = testdir.parseconfigure(sub)
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")
def test_confcutdir(self, testdir):
sub = testdir.mkdir("sub")