Streamline checks for verbose option (#12706) (#12778)

patchback[bot] · GTowers1 · web-flow · commit bc913d194ec0 · 2024-09-05T11:22:37.000Z
Instead of calling `Config.option.verbose`, call the new `Config.get_verbosity` function to determine the verbosity level. This enables pytest to run correctly with the terminal plugin disabled. Fix #9422 (cherry picked from commit 72c682f) Co-authored-by: GTowers1 <130098608+GTowers1@users.noreply.github.com>
diff --git a/changelog/9422.bugfix.rst b/changelog/9422.bugfix.rst
@@ -0,0 +1,3 @@
+Fix bug where disabling the terminal plugin via ``-p no:terminal`` would cause crashes related to missing the ``verbose`` option.
+
+-- by :user:`GTowers1`
diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
@@ -460,7 +460,7 @@ display more information if applicable:
 
 
     def pytest_report_header(config):
-        if config.getoption("verbose") > 0:
+        if config.get_verbosity() > 0:
             return ["info1: did you know that ...", "did you?"]
 
 which will add info only when run with "--v":
diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py
@@ -347,7 +347,7 @@ def get_last_failed_paths(self) -> set[Path]:
         return {x for x in result if x.exists()}
 
     def pytest_report_collectionfinish(self) -> str | None:
-        if self.active and self.config.getoption("verbose") >= 0:
+        if self.active and self.config.get_verbosity() >= 0:
             return f"run-last-failure: {self._report_status}"
         return None
 
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -1744,7 +1744,7 @@ def get_verbosity(self, verbosity_type: str | None = None) -> int:
             print(config.get_verbosity())  # 1
             print(config.get_verbosity(Config.VERBOSITY_ASSERTIONS))  # 2
         """
-        global_level = self.option.verbose
+        global_level = self.getoption("verbose", default=0)
         assert isinstance(global_level, int)
         if verbosity_type is None:
             return global_level
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
@@ -1348,7 +1348,7 @@ def pytestconfig(request: FixtureRequest) -> Config:
     Example::
 
         def test_foo(pytestconfig):
-            if pytestconfig.getoption("verbose") > 0:
+            if pytestconfig.get_verbosity() > 0:
                 ...
 
     """
@@ -1807,7 +1807,7 @@ def _show_fixtures_per_test(config: Config, session: Session) -> None:
     session.perform_collect()
     invocation_dir = config.invocation_params.dir
     tw = _pytest.config.create_terminal_writer(config)
-    verbose = config.getvalue("verbose")
+    verbose = config.get_verbosity()
 
     def get_best_relpath(func) -> str:
         loc = getlocation(func, invocation_dir)
@@ -1866,7 +1866,7 @@ def _showfixtures_main(config: Config, session: Session) -> None:
     session.perform_collect()
     invocation_dir = config.invocation_params.dir
     tw = _pytest.config.create_terminal_writer(config)
-    verbose = config.getvalue("verbose")
+    verbose = config.get_verbosity()
 
     fm = session._fixturemanager
 
diff --git a/src/_pytest/logging.py b/src/_pytest/logging.py
@@ -794,7 +794,7 @@ def pytest_runtestloop(self, session: Session) -> Generator[None, object, object
         if session.config.option.collectonly:
             return (yield)
 
-        if self._log_cli_enabled() and self._config.getoption("verbose") < 1:
+        if self._log_cli_enabled() and self._config.get_verbosity() < 1:
             # The verbose flag is needed to avoid messy test progress output.
             self._config.option.verbose = 1
 
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
@@ -435,12 +435,12 @@ def _repr_failure_py(
             else:
                 style = "long"
 
-        if self.config.getoption("verbose", 0) > 1:
+        if self.config.get_verbosity() > 1:
             truncate_locals = False
         else:
             truncate_locals = True
 
-        truncate_args = False if self.config.getoption("verbose", 0) > 2 else True
+        truncate_args = False if self.config.get_verbosity() > 2 else True
 
         # excinfo.getrepr() formats paths relative to the CWD if `abspath` is False.
         # It is possible for a fixture/test to change the CWD while this code runs, which
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
@@ -512,7 +512,7 @@ def importtestmodule(
         ) from e
     except ImportError as e:
         exc_info = ExceptionInfo.from_current()
-        if config.getoption("verbose") < 2:
+        if config.get_verbosity() < 2:
             exc_info.traceback = exc_info.traceback.filter(filter_traceback)
         exc_repr = (
             exc_info.getrepr(style="short")
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
@@ -71,7 +71,7 @@ def pytest_addoption(parser: Parser) -> None:
 def pytest_terminal_summary(terminalreporter: TerminalReporter) -> None:
     durations = terminalreporter.config.option.durations
     durations_min = terminalreporter.config.option.durations_min
-    verbose = terminalreporter.config.getvalue("verbose")
+    verbose = terminalreporter.config.get_verbosity()
     if durations is None:
         return
     tr = terminalreporter
diff --git a/src/_pytest/stepwise.py b/src/_pytest/stepwise.py
@@ -113,7 +113,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
                     self.lastfailed = None
 
     def pytest_report_collectionfinish(self) -> str | None:
-        if self.config.getoption("verbose") >= 0 and self.report_status:
+        if self.config.get_verbosity() >= 0 and self.report_status:
             return f"stepwise: {self.report_status}"
         return None
 
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
@@ -1486,3 +1486,10 @@ def my_fixture(self, request):
         raise AssertionError(
             f"pytest command failed:\n{exc.stdout=!s}\n{exc.stderr=!s}"
         ) from exc
+
+
+def test_no_terminal_plugin(pytester: Pytester) -> None:
+    """Smoke test to ensure pytest can execute without the terminal plugin (#9422)."""
+    pytester.makepyfile("def test(): assert 1 == 2")
+    result = pytester.runpytest("-pno:terminal", "-s")
+    assert result.ret == ExitCode.TESTS_FAILED

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix bug where disabling the terminal plugin via ``-p no:terminal`` would cause crashes related to missing the ``verbose`` option.
	`2`	`+`
	`3`	+-- by :user:`GTowers1`