Strengthen all tests

Author: nicoddemus

src/_pytest/_code/code.py

@@ -1048,7 +1048,7 @@ def toterminal(self, tw: TerminalWriter) -> None:
             self.reprfileloc.toterminal(tw)
             tw.write_source(source)
             for line in traceback_lines.explanations:
-                tw.line(line, red=True, bold=True)
+                tw.line(line, bold=True, red=True)
             if self.reprlocals:
                 self.reprlocals.toterminal(tw, indent=" " * 8)
             return
@@ -1058,7 +1058,7 @@ def toterminal(self, tw: TerminalWriter) -> None:
 
         tw.write_source(source)
         for line in traceback_lines.explanations:
-            tw.line(line, red=True, bold=True)
+            tw.line(line, bold=True, red=True)
 
         if self.reprlocals:
             tw.line("")

src/_pytest/_io/__init__.py

@@ -14,7 +14,7 @@ def write_source(self, source: str) -> None:
 
     def _highlight(self, source):
         """Highlight the given source code according to the "code_highlight" option"""
-        if not self.hasmarkup and 0:
+        if not self.hasmarkup:
             return source
         try:
             from pygments.formatters.terminal import TerminalFormatter
@@ -32,8 +32,8 @@ class ParsedTraceback:
     errors = attr.ib()  # type: Tuple[str, ...]
     explanations = attr.ib()  # type: Tuple[str, ...]
 
-    ERROR_PREFIX = ">    "
-    EXPLANATION_PREFIX = "E    "
+    ERROR_PREFIX = ">   "
+    EXPLANATION_PREFIX = "E   "
 
     class State(Enum):
         source = auto()
@@ -51,8 +51,9 @@ def from_lines(cls, lines: Sequence[str]) -> "ParsedTraceback":
         for line in lines:
             if state == cls.State.source and line.startswith(cls.ERROR_PREFIX):
                 state = cls.State.error
-            elif state == cls.State.error and line.startswith(cls.EXPLANATION_PREFIX):
+            if line.startswith(cls.EXPLANATION_PREFIX):
                 state = cls.State.explanation
+
             if state == cls.State.source:
                 sources.append(line)
             elif state == cls.State.error:

testing/code/test_code.py

@@ -226,3 +226,14 @@ def test_with_continuations(self):
             "E       assert 1 == 2\n",
             "E        +  where 2 = z()\n",
         )
+
+    def test_no_flow_lines(self):
+        lines = [
+            "    assert 0\n",
+            "E   assert 0\n",
+        ]
+
+        result = ParsedTraceback.from_lines(lines)
+        assert result.sources == ("    assert 0\n",)
+        assert result.errors == ()
+        assert result.explanations == ("E   assert 0\n",)

testing/conftest.py

@@ -79,7 +79,7 @@ def write(self, msg, **kw):
 
         def write_source(self, source):
             for line in source.splitlines():
-                self.line(source)
+                self.line(line)
 
         def line(self, line, **kw):
             self.lines.append(line)

testing/test_terminal.py

@@ -920,9 +920,16 @@ def test_this():
                 "=*= FAILURES =*=",
                 "{red}{bold}_*_ test_this _*_{reset}",
                 "",
+                "    {kw}def{hl-reset} {function}test_this{hl-reset}():",
+                ">       fail()",
+                "",
                 "{bold}{red}test_color_yes.py{reset}:5: ",
                 "_ _ * _ _*",
                 "",
+                "    {kw}def{hl-reset} {function}fail{hl-reset}():",
+                ">       {kw}assert{hl-reset} {number}0{hl-reset}",
+                "{bold}{red}E       assert 0{reset}",
+                "",
                 "{bold}{red}test_color_yes.py{reset}:2: AssertionError",
                 "{red}=*= {red}{bold}1 failed{reset}{red} in *s{reset}{red} =*={reset}",
             ]
@@ -941,7 +948,10 @@ def test_this():
                 "=*= FAILURES =*=",
                 "{red}{bold}_*_ test_this _*_{reset}",
                 "{bold}{red}test_color_yes.py{reset}:5: in test_this",
+                "    fail()",
                 "{bold}{red}test_color_yes.py{reset}:2: in fail",
+                "    {kw}assert{hl-reset} {number}0{hl-reset}",
+                "{bold}{red}E   assert 0{reset}",
                 "{red}=*= {red}{bold}1 failed{reset}{red} in *s{reset}{red} =*={reset}",
             ]
         ]
@@ -2029,7 +2039,7 @@ def test_foo():
             for line in [
                 "    {kw}def{hl-reset} {function}test_foo{hl-reset}():",
                 ">       {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}",
-                "{red}{bold}E       assert 1 == 10{reset}",
+                "{bold}{red}E       assert 1 == 10{reset}",
             ]
         ]
     )