Merge pull request #6261 from blueyed/stats-keys

terminal: _get_main_color: help pytest-parallel
pytest-dev · Nov 22, 2019 · 0601f5c · 0601f5c
2 parents a7268aa + 1f736a6
commit 0601f5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/6254.bugfix.rst b/changelog/6254.bugfix.rst
@@ -0,0 +1 @@
+Fix compatibility with pytest-parallel (regression in pytest 5.3.0).
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
@@ -1099,7 +1099,7 @@ def _get_main_color(stats) -> Tuple[str, List[str]]:
         "failed passed skipped deselected xfailed xpassed warnings error".split()
     )
     unknown_type_seen = False
-    for found_type in stats:
+    for found_type in stats.keys():
         if found_type not in known_types:
             if found_type:  # setup/teardown reports have an empty key, ignore them
                 known_types.append(found_type)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix compatibility with pytest-parallel (regression in pytest 5.3.0).