From 83351a33682df31fca12e6baf67370ab21af185b Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 20 Jul 2019 06:08:22 +0200 Subject: [PATCH 1/2] doc: improve help for filterwarnings --- src/_pytest/warnings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pytest/warnings.py b/src/_pytest/warnings.py index 63d22477c..d817a5cfa 100644 --- a/src/_pytest/warnings.py +++ b/src/_pytest/warnings.py @@ -42,7 +42,7 @@ def pytest_addoption(parser): type="linelist", help="Each line specifies a pattern for " "warnings.filterwarnings. " - "Processed after -W and --pythonwarnings.", + "Processed after -W/--pythonwarnings.", ) From a6152db84adfb7e9b64c16826aad73d5be91cb28 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 20 Oct 2019 17:57:25 +0200 Subject: [PATCH 2/2] setuponly: pytest_fixture_setup: use option directly --- src/_pytest/setuponly.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/_pytest/setuponly.py b/src/_pytest/setuponly.py index 70d6ed12f..13c2886bb 100644 --- a/src/_pytest/setuponly.py +++ b/src/_pytest/setuponly.py @@ -22,8 +22,7 @@ def pytest_addoption(parser): @pytest.hookimpl(hookwrapper=True) def pytest_fixture_setup(fixturedef, request): yield - config = request.config - if config.option.setupshow: + if request.config.option.setupshow: if hasattr(request, "param"): # Save the fixture parameter so ._show_fixture_action() can # display it now and during the teardown (in .finish()).