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

Merge pull request #7303 from nicoddemus/flaky-ini-keys 

Show invalid ini keys sorted
This commit is contained in:
Anthony Sottile 2020-06-02 12:30:33 -07:00 committed by GitHub
parent 69d2ddcf1d 8ac18bbecb
commit 5814f77455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/config/__init__.py
View File

@ -1074,7 +1074,7 @@ class Config:
) )
def _validatekeys(self): def _validatekeys(self):
for key in self._get_unknown_ini_keys(): for key in sorted(self._get_unknown_ini_keys()):
message = "Unknown config ini key: {}\n".format(key) message = "Unknown config ini key: {}\n".format(key)
if self.known_args_namespace.strict_config: if self.known_args_namespace.strict_config:
fail(message, pytrace=False) fail(message, pytrace=False)

8
testing/test_config.py
View File

@ -158,10 +158,10 @@ class TestParseIni:
""", """,
["unknown_ini", "another_unknown_ini"], ["unknown_ini", "another_unknown_ini"],
[ [
"WARNING: Unknown config ini key: unknown_ini",
"WARNING: Unknown config ini key: another_unknown_ini", "WARNING: Unknown config ini key: another_unknown_ini",
"WARNING: Unknown config ini key: unknown_ini",
], ],
"Unknown config ini key: unknown_ini", "Unknown config ini key: another_unknown_ini",
), ),
( (
""" """
@ -200,9 +200,7 @@ class TestParseIni:
): ):
testdir.tmpdir.join("pytest.ini").write(textwrap.dedent(ini_file_text)) testdir.tmpdir.join("pytest.ini").write(textwrap.dedent(ini_file_text))
config = testdir.parseconfig() config = testdir.parseconfig()
assert config._get_unknown_ini_keys() == invalid_keys, str( assert sorted(config._get_unknown_ini_keys()) == sorted(invalid_keys)
config._get_unknown_ini_keys()
)
result = testdir.runpytest() result = testdir.runpytest()
result.stderr.fnmatch_lines(stderr_output) result.stderr.fnmatch_lines(stderr_output)