Add strict ini option to enable all other strictness options

The `--strict` option is undeprecated and enables `strict`.

Fix #13823.

Author: bluetech

changelog/13823.feature.rst

@@ -0,0 +1,10 @@
+Added a :confval:`strict` configuration option to enable all strictness-related options.
+
+When set to ``True``, the :confval:`strict` option currently enables :confval:`strict_config`,
+:confval:`strict_markers`, :confval:`strict_xfail`, and :confval:`strict_parametrization_ids`.
+
+The individual strictness options can be explicitly set to override the global :confval:`strict` setting.
+
+If new strictness options are added in the future, they will also be automatically enabled by :confval:`strict`.
+Therefore, we only recommend setting ``strict=True`` if you're using a locked version of pytest,
+or if you want to proactively adopt new strictness options as they are added.

doc/en/deprecations.rst

@@ -589,18 +589,20 @@ removed in pytest 8 (deprecated since pytest 2.4.0):
 - ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
 
 
-The ``--strict`` command-line option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``--strict`` command-line option (reintroduced)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. deprecated:: 6.2
-.. versionremoved:: 8.0
+.. versionchanged:: 9.0
 
-The ``--strict`` command-line option has been deprecated in favor of ``--strict-markers``, which
+The ``--strict`` command-line option had been deprecated in favor of ``--strict-markers``, which
 better conveys what the option does.
 
-We have plans to maybe in the future to reintroduce ``--strict`` and make it an encompassing
-flag for all strictness related options (``--strict-markers`` and ``--strict-config``
-at the moment, more might be introduced in the future).
+In version 8.1, we accidentally un-deprecated ``--strict``.
+
+In version 9.0, we changed ``--strict`` to make it set the new :confval:`strict`
+configuration option. It now enables all strictness related options (including
+:confval:`strict_markers`).
 
 
 .. _cmdline-preparse-deprecated:

doc/en/reference/reference.rst

@@ -2066,6 +2066,32 @@ passed multiple times. The expected format is ``name=value``. For example::
     "auto" can be used to explicitly use the global verbosity level.
 
 
+.. confval:: strict
+
+    If set to ``True``, enables all strictness options:
+
+    * :confval:`strict_config`
+    * :confval:`strict_markers`
+    * :confval:`strict_xfail`
+    * :confval:`strict_parametrization_ids`
+
+    Plugins may also enable their own strictness options.
+
+    If you explicitly set an individual strictness option, it takes precedence over ``strict``.
+
+    .. note::
+        If new strictness options are added to pytest in the future, they will also be enabled by ``strict``.
+        We therefore only recommend using this option when using a locked version of pytest,
+        or if you want to proactively adopt new strictness options as they are added.
+
+    .. code-block:: ini
+
+        [pytest]
+        strict = True
+
+    .. versionadded:: 9.0
+
+
 .. confval:: strict_xfail
 
     If set to ``True``, tests marked with ``@pytest.mark.xfail`` that actually succeed will by default fail the
@@ -2078,6 +2104,8 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         strict_xfail = True
 
+    You can also enable this option via the :confval:`strict` option.
+
     .. versionchanged:: 9.0
         Renamed from ``xfail_strict`` to ``strict_xfail``.
         ``xfail_strict`` is accepted as an alias for ``strict_xfail``.
@@ -2092,6 +2120,8 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         strict_config = True
 
+    You can also enable this option via the :confval:`strict` option.
+
 
 .. confval:: strict_markers
 
@@ -2102,6 +2132,8 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         strict_markers = True
 
+    You can also enable this option via the :confval:`strict` option.
+
 
 .. confval:: strict_parametrization_ids
 
@@ -2115,6 +2147,8 @@ passed multiple times. The expected format is ``name=value``. For example::
           [pytest]
           strict_parametrization_ids = True
 
+    You can also enable this option via the :confval:`strict` option.
+
     For example,
 
     .. code-block:: python

pyproject.toml

@@ -378,10 +378,7 @@ norecursedirs = [
     "build",
     "dist",
 ]
-strict_xfail = true
-strict_parametrization_ids = true
-strict_markers = true
-strict_config = true
+strict = true
 filterwarnings = [
     "error",
     "default:Using or importing the ABCs:DeprecationWarning:unittest2.*",

src/_pytest/config/__init__.py

@@ -1516,6 +1516,8 @@ def _validate_plugins(self) -> None:
 
     def _warn_or_fail_if_strict(self, message: str) -> None:
         strict_config = self.getini("strict_config")
+        if strict_config is None:
+            strict_config = self.getini("strict")
         if strict_config:
             raise UsageError(message)
 

src/_pytest/main.py

@@ -90,21 +90,32 @@ def pytest_addoption(parser: Parser) -> None:
     )
     group.addoption(
         "--strict",
-        action="store_true",
-        help="(Deprecated) alias to --strict-markers",
+        action=OverrideIniAction,
+        ini_option="strict",
+        ini_value="true",
+        help="Enables the strict option",
     )
     parser.addini(
         "strict_config",
         "Any warnings encountered while parsing the `pytest` section of the "
         "configuration file raise errors",
         type="bool",
-        default=False,
+        # None => fallback to `strict`.
+        default=None,
     )
     parser.addini(
         "strict_markers",
         "Markers not registered in the `markers` section of the configuration "
         "file raise errors",
         type="bool",
+        # None => fallback to `strict`.
+        default=None,
+    )
+    parser.addini(
+        "strict",
+        "Enables all strictness options, currently: "
+        "strict_config, strict_markers, strict_xfail, strict_parametrization_ids",
+        type="bool",
         default=False,
     )
 

src/_pytest/mark/structures.py

@@ -585,9 +585,9 @@ def __getattr__(self, name: str) -> MarkDecorator:
                     __tracebackhide__ = True
                     fail(f"Unknown '{name}' mark, did you mean 'parametrize'?")
 
-                strict_markers = (
-                    self._config.getini("strict_markers") or self._config.option.strict
-                )
+                strict_markers = self._config.getini("strict_markers")
+                if strict_markers is None:
+                    strict_markers = self._config.getini("strict")
                 if strict_markers:
                     fail(
                         f"{name!r} not found in `markers` configuration option",

src/_pytest/python.py

@@ -24,6 +24,7 @@
 import textwrap
 import types
 from typing import Any
+from typing import cast
 from typing import final
 from typing import Literal
 from typing import NoReturn
@@ -111,7 +112,8 @@ def pytest_addoption(parser: Parser) -> None:
     parser.addini(
         "strict_parametrization_ids",
         type="bool",
-        default=False,
+        # None => fallback to `strict`.
+        default=None,
         help="Emit an error if non-unique parameter set IDs are detected",
     )
 
@@ -963,9 +965,12 @@ def make_unique_parameterset_ids(self) -> list[str | _HiddenParam]:
         return resolved_ids
 
     def _strict_parametrization_ids_enabled(self) -> bool:
-        if self.config:
-            return bool(self.config.getini("strict_parametrization_ids"))
-        return False
+        if self.config is None:
+            return False
+        strict_parametrization_ids = self.config.getini("strict_parametrization_ids")
+        if strict_parametrization_ids is None:
+            strict_parametrization_ids = self.config.getini("strict")
+        return cast(bool, strict_parametrization_ids)
 
     def _resolve_ids(self) -> Iterable[str | _HiddenParam]:
         """Resolve IDs for all ParameterSets (may contain duplicates)."""

src/_pytest/skipping.py

@@ -40,8 +40,9 @@ def pytest_addoption(parser: Parser) -> None:
         "strict_xfail",
         "Default for the strict parameter of xfail "
         "markers when not given explicitly (default: False) (alias: xfail_strict)",
-        default=False,
         type="bool",
+        # None => fallback to `strict`.
+        default=None,
         aliases=["xfail_strict"],
     )
 
@@ -214,7 +215,11 @@ def evaluate_xfail_marks(item: Item) -> Xfail | None:
     """Evaluate xfail marks on item, returning Xfail if triggered."""
     for mark in item.iter_markers(name="xfail"):
         run = mark.kwargs.get("run", True)
-        strict = mark.kwargs.get("strict", item.config.getini("strict_xfail"))
+        strict = mark.kwargs.get("strict")
+        if strict is None:
+            strict = item.config.getini("strict_xfail")
+        if strict is None:
+            strict = item.config.getini("strict")
         raises = mark.kwargs.get("raises", None)
         if "condition" not in mark.kwargs:
             conditions = mark.args

testing/test_collection.py

@@ -2726,15 +2726,17 @@ def test_1(): pass
         ),
     ],
 )
+@pytest.mark.parametrize("option_name", ["strict_parametrization_ids", "strict"])
 def test_strict_parametrization_ids(
     pytester: Pytester,
     x_y: Sequence[tuple[int, int]],
     expected_duplicates: Sequence[str],
+    option_name: str,
 ) -> None:
     pytester.makeini(
-        """
+        f"""
         [pytest]
-        strict_parametrization_ids = true
+        {option_name} = true
         """
     )
     pytester.makepyfile(