jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename _emit_warning_or_fail to _warn_or_fail_if_strict and fix a doc typo

This commit is contained in:
Gleb Nikonorov 2020-06-12 08:27:55 -04:00
parent c18afb59f5
commit 2c8e356174
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/reference.rst
View File

@ -1564,7 +1564,7 @@ passed multiple times. The expected format is ``name=value``. For example::
.. confval:: required_plugins .. confval:: required_plugins
A space separated list of plugins that must be present for pytest to run. A space separated list of plugins that must be present for pytest to run.
If any one of the plugins is not found, emit a error. If any one of the plugins is not found, emit an error.
.. code-block:: ini .. code-block:: ini

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

@ -1087,7 +1087,7 @@ class Config:
def _validate_keys(self) -> None: def _validate_keys(self) -> None:
for key in sorted(self._get_unknown_ini_keys()): for key in sorted(self._get_unknown_ini_keys()):
self._emit_warning_or_fail("Unknown config ini key: {}\n".format(key)) self._warn_or_fail_if_strict("Unknown config ini key: {}\n".format(key))
def _validate_plugins(self) -> None: def _validate_plugins(self) -> None:
required_plugins = sorted(self.getini("required_plugins")) required_plugins = sorted(self.getini("required_plugins"))
@ -1108,7 +1108,7 @@ class Config:
pytrace=False, pytrace=False,
) )
def _emit_warning_or_fail(self, message: str) -> None: def _warn_or_fail_if_strict(self, message: str) -> None:
if self.known_args_namespace.strict_config: if self.known_args_namespace.strict_config:
fail(message, pytrace=False) fail(message, pytrace=False)
sys.stderr.write("WARNING: {}".format(message)) sys.stderr.write("WARNING: {}".format(message))