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

Merge branch 'main' into test-case-verbosity

This commit is contained in:
Patrick Lannigan 2023-12-02 21:19:41 -05:00
parent 61cc290f3e 5689d806cf
commit be2eb4ab83
No known key found for this signature in database
GPG Key ID: BBF5D9DED1E4AAF9
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/how-to/logging.rst
View File

@ -241,7 +241,7 @@ through ``add_color_level()``. Example:
.. code-block:: python .. code-block:: python
@pytest.hookimpl @pytest.hookimpl(trylast=True)
def pytest_configure(config): def pytest_configure(config):
logging_plugin = config.pluginmanager.get_plugin("logging-plugin") logging_plugin = config.pluginmanager.get_plugin("logging-plugin")

10
testing/test_config.py
View File

@ -1959,16 +1959,6 @@ def test_invocation_args(pytester: Pytester) -> None:
], ],
) )
def test_config_blocked_default_plugins(pytester: Pytester, plugin: str) -> None: def test_config_blocked_default_plugins(pytester: Pytester, plugin: str) -> None:
if plugin == "debugging":
# Fixed in xdist (after 1.27.0).
# https://github.com/pytest-dev/pytest-xdist/pull/422
try:
import xdist # noqa: F401
except ImportError:
pass
else:
pytest.skip("does not work with xdist currently")
p = pytester.makepyfile("def test(): pass") p = pytester.makepyfile("def test(): pass")
result = pytester.runpytest(str(p), "-pno:%s" % plugin) result = pytester.runpytest(str(p), "-pno:%s" % plugin)