Merge pull request #7521 from asottile/newlines_unaffected

Preserve newlines when captured with capfd

Author: asottile

changelog/7517.bugfix.rst

@@ -0,0 +1 @@
+Preserve line endings when captured via ``capfd``.

src/_pytest/capture.py

@@ -388,6 +388,7 @@ def __init__(self, targetfd: int) -> None:
                 TemporaryFile(buffering=0),  # type: ignore[arg-type]
                 encoding="utf-8",
                 errors="replace",
+                newline="",
                 write_through=True,
             )
             if targetfd in patchsysdict:

testing/test_capture.py

@@ -514,6 +514,12 @@ def test_hello(capfd):
         )
         reprec.assertoutcome(passed=1)
 
+    @pytest.mark.parametrize("nl", ("\n", "\r\n", "\r"))
+    def test_cafd_preserves_newlines(self, capfd, nl):
+        print("test", end=nl)
+        out, err = capfd.readouterr()
+        assert out.endswith(nl)
+
     def test_capfdbinary(self, testdir):
         reprec = testdir.inline_runsource(
             """\