subtests: avoid double saferepr() (#14213)

#13963 makes sure that values of `SubtestContext.kwargs` are strings by applying `saferepr()`. Thus, there is no need to apply `saferepr()` again for the description.

Avoiding the second `saferepr()` results in nicer output and avoids a change in the output compared to previous pytest versions.

Author: radoering

src/_pytest/subtests.py

@@ -91,7 +91,7 @@ def _sub_test_description(self) -> str:
             parts.append(f"[{self.context.msg}]")
         if self.context.kwargs:
             params_desc = ", ".join(
-                f"{k}={saferepr(v)}" for (k, v) in self.context.kwargs.items()
+                f"{k}={v}" for (k, v) in self.context.kwargs.items()
             )
             parts.append(f"({params_desc})")
         return " ".join(parts) or "(<subtest>)"

testing/test_subtests.py

@@ -305,9 +305,9 @@ def test_foo(subtests, x):
     result = pytester.runpytest("-v")
     result.stdout.fnmatch_lines(
         [
-            "*.py::test_foo[[]0[]] SUBFAILED[[]custom[]] (i='1') *[[] 50%[]]",
+            "*.py::test_foo[[]0[]] SUBFAILED[[]custom[]] (i=1) *[[] 50%[]]",
             "*.py::test_foo[[]0[]] FAILED                        *[[] 50%[]]",
-            "*.py::test_foo[[]1[]] SUBFAILED[[]custom[]] (i='1') *[[]100%[]]",
+            "*.py::test_foo[[]1[]] SUBFAILED[[]custom[]] (i=1) *[[]100%[]]",
             "*.py::test_foo[[]1[]] FAILED                        *[[]100%[]]",
             "contains 1 failed subtest",
             "* 4 failed, 4 subtests passed in *",
@@ -323,9 +323,9 @@ def test_foo(subtests, x):
     result = pytester.runpytest("-v")
     result.stdout.fnmatch_lines(
         [
-            "*.py::test_foo[[]0[]] SUBFAILED[[]custom[]] (i='1') *[[] 50%[]]",
+            "*.py::test_foo[[]0[]] SUBFAILED[[]custom[]] (i=1) *[[] 50%[]]",
             "*.py::test_foo[[]0[]] FAILED                        *[[] 50%[]]",
-            "*.py::test_foo[[]1[]] SUBFAILED[[]custom[]] (i='1') *[[]100%[]]",
+            "*.py::test_foo[[]1[]] SUBFAILED[[]custom[]] (i=1) *[[]100%[]]",
             "*.py::test_foo[[]1[]] FAILED                        *[[]100%[]]",
             "contains 1 failed subtest",
             "* 4 failed in *",
@@ -710,12 +710,12 @@ def test_capturing(self, pytester: pytest.Pytester, mode: str) -> None:
         result = pytester.runpytest(f"--capture={mode}")
         result.stdout.fnmatch_lines(
             [
-                "*__ test (i=\"'A'\") __*",
+                "*__ test (i='A') __*",
                 "*Captured stdout call*",
                 "hello stdout A",
                 "*Captured stderr call*",
                 "hello stderr A",
-                "*__ test (i=\"'B'\") __*",
+                "*__ test (i='B') __*",
                 "*Captured stdout call*",
                 "hello stdout B",
                 "*Captured stderr call*",
@@ -736,8 +736,8 @@ def test_no_capture(self, pytester: pytest.Pytester) -> None:
                 "hello stdout A",
                 "uhello stdout B",
                 "uend test",
-                "*__ test (i=\"'A'\") __*",
-                "*__ test (i=\"'B'\") __*",
+                "*__ test (i='A') __*",
+                "*__ test (i='B') __*",
                 "*__ test __*",
             ]
         )