logging: Improve formatting of multiline message

1 files changed, 30 insertions, 0 deletions

diff --git a/testing/logging/test_formatter.py b/testing/logging/test_formatter.py
index 1610da845..c851c34d7 100644
--- a/testing/logging/test_formatter.py
+++ b/testing/logging/test_formatter.py
@@ -2,7 +2,9 @@
 import logging
 
 import py.io
+import six
 
+import pytest
 from _pytest.logging import ColoredLevelFormatter
 
 
@@ -35,3 +37,31 @@ def test_coloredlogformatter():
     formatter = ColoredLevelFormatter(tw, logfmt)
     output = formatter.format(record)
     assert output == ("dummypath                   10 INFO     Test Message")
+
+
+@pytest.mark.skipif(
+    six.PY2, reason="Formatter classes don't support format styles in PY2"
+)
+def test_multiline_message():
+    from _pytest.logging import PercentStyleMultiline
+
+    logfmt = "%(filename)-25s %(lineno)4d %(levelname)-8s %(message)s"
+
+    record = logging.LogRecord(
+        name="dummy",
+        level=logging.INFO,
+        pathname="dummypath",
+        lineno=10,
+        msg="Test Message line1\nline2",
+        args=(),
+        exc_info=False,
+    )
+    # this is called by logging.Formatter.format
+    record.message = record.getMessage()
+
+    style = PercentStyleMultiline(logfmt)
+    output = style.format(record)
+    assert output == (
+        "dummypath                   10 INFO     Test Message line1\n"
+        "                                        line2"
+    )