terminal: use "yellow" with any "xpassed" tests

Closes pytest-dev#449.
blueyed · Jan 9, 2020 · 13baab7 · 13baab7
1 parent 9f1ade9
commit 13baab7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/changelog/449.improvement.rst b/changelog/449.improvement.rst
@@ -0,0 +1 @@
+Use "yellow" main color with any XPASSED tests.
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
@@ -1107,7 +1107,7 @@ def _get_main_color(stats) -> Tuple[str, List[str]]:
     # main color
     if "failed" in stats or "error" in stats:
         main_color = "red"
-    elif "warnings" in stats or unknown_type_seen:
+    elif "warnings" in stats or "xpassed" in stats or unknown_type_seen:
         main_color = "yellow"
     elif "passed" in stats:
         main_color = "green"

diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -1385,10 +1385,10 @@ def test_failure():
         ),
         ("yellow", [("1 xpassed", {"bold": True, "yellow": True})], {"xpassed": (1,)}),
         (
-            "green",
+            "yellow",
             [
-                ("1 passed", {"bold": True, "green": True}),
-                ("1 xpassed", {"bold": False, "yellow": True}),
+                ("1 passed", {"bold": False, "green": True}),
+                ("1 xpassed", {"bold": True, "yellow": True}),
             ],
             {"xpassed": (1,), "passed": (1,)},
         ),