Rename xfail_strict to strict_xfail, make it an alias

This is to make it consistent with the other `strict_` options.

For #13823.

Author: bluetech

changelog/13823.improvement.rst

@@ -0,0 +1,2 @@
+Added :confval:`strict_xfail` as an alias to the ``xfail_strict`` option.
+This makes it consistent with other strictness options.

doc/en/how-to/skipping.rst

@@ -331,12 +331,12 @@ You can change this by setting the ``strict`` keyword-only parameter to ``True``
 This will make ``XPASS`` ("unexpectedly passing") results from this test to fail the test suite.
 
 You can change the default value of the ``strict`` parameter using the
-``xfail_strict`` ini option:
+``strict_xfail`` ini option:
 
 .. code-block:: ini
 
     [pytest]
-    xfail_strict=true
+    strict_xfail=true
 
 
 Ignoring xfail

doc/en/reference/reference.rst

@@ -261,7 +261,7 @@ pytest.mark.xfail
 
 Marks a test function as *expected to fail*.
 
-.. py:function:: pytest.mark.xfail(condition=False, *, reason=None, raises=None, run=True, strict=xfail_strict)
+.. py:function:: pytest.mark.xfail(condition=False, *, reason=None, raises=None, run=True, strict=strict_xfail)
 
     :keyword Union[bool, str] condition:
         Condition for marking the test function as xfail (``True/False`` or a
@@ -286,7 +286,7 @@ Marks a test function as *expected to fail*.
           that are always failing and there should be a clear indication if they unexpectedly start to pass (for example
           a new release of a library fixes a known bug).
 
-        Defaults to :confval:`xfail_strict`, which is ``False`` by default.
+        Defaults to :confval:`strict_xfail`, which is ``False`` by default.
 
 
 Custom marks
@@ -2070,7 +2070,7 @@ passed multiple times. The expected format is ``name=value``. For example::
     "auto" can be used to explicitly use the global verbosity level.
 
 
-.. confval:: xfail_strict
+.. confval:: strict_xfail
 
     If set to ``True``, tests marked with ``@pytest.mark.xfail`` that actually succeed will by default fail the
     test suite.
@@ -2080,7 +2080,11 @@ passed multiple times. The expected format is ``name=value``. For example::
     .. code-block:: ini
 
         [pytest]
-        xfail_strict = True
+        strict_xfail = True
+
+    .. versionchanged:: 9.0
+        Renamed from ``xfail_strict`` to ``strict_xfail``.
+        ``xfail_strict`` is accepted as an alias for ``strict_xfail``.
 
 .. confval:: strict_parametrization_ids
 

pyproject.toml

@@ -378,7 +378,7 @@ norecursedirs = [
     "build",
     "dist",
 ]
-xfail_strict = true
+strict_xfail = true
 strict_parametrization_ids = true
 filterwarnings = [
     "error",

src/_pytest/helpconfig.py

@@ -103,7 +103,7 @@ def pytest_addoption(parser: Parser) -> None:
         dest="override_ini",
         action="append",
         help='Override ini option with "option=value" style, '
-        "e.g. `-o xfail_strict=True -o cache_dir=cache`.",
+        "e.g. `-o strict_xfail=True -o cache_dir=cache`.",
     )
 
 

src/_pytest/skipping.py

@@ -37,11 +37,12 @@ def pytest_addoption(parser: Parser) -> None:
     )
 
     parser.addini(
-        "xfail_strict",
+        "strict_xfail",
         "Default for the strict parameter of xfail "
-        "markers when not given explicitly (default: False)",
+        "markers when not given explicitly (default: False) (alias: xfail_strict)",
         default=False,
         type="bool",
+        aliases=["xfail_strict"],
     )
 
 
@@ -74,7 +75,7 @@ def nop(*args, **kwargs):
     )
     config.addinivalue_line(
         "markers",
-        "xfail(condition, ..., *, reason=..., run=True, raises=None, strict=xfail_strict): "
+        "xfail(condition, ..., *, reason=..., run=True, raises=None, strict=strict_xfail): "
         "mark the test function as an expected failure if any of the conditions "
         "evaluate to True. Optionally specify a reason for better reporting "
         "and run=False if you don't even want to execute the test function. "
@@ -213,7 +214,7 @@ 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("xfail_strict"))
+        strict = mark.kwargs.get("strict", item.config.getini("strict_xfail"))
         raises = mark.kwargs.get("raises", None)
         if "condition" not in mark.kwargs:
             conditions = mark.args

testing/test_skipping.py

@@ -690,7 +690,7 @@ def test_strict_xfail_default_from_file(
         pytester.makeini(
             f"""
             [pytest]
-            xfail_strict = {strict_val}
+            strict_xfail = {strict_val}
         """
         )
         p = pytester.makepyfile(
@@ -1178,7 +1178,7 @@ def test_default_markers(pytester: Pytester) -> None:
     result.stdout.fnmatch_lines(
         [
             "*skipif(condition, ..., [*], reason=...)*skip*",
-            "*xfail(condition, ..., [*], reason=..., run=True, raises=None, strict=xfail_strict)*expected failure*",
+            "*xfail(condition, ..., [*], reason=..., run=True, raises=None, strict=strict_xfail)*expected failure*",
         ]
     )