Merge pull request #6261 from blueyed/stats-keys

blueyed · web-flow · commit 0601f5cdad56 · 2019-11-22T17:12:33.000+01:00
terminal: _get_main_color: help pytest-parallel
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 @@`
	`1`	`+Fix compatibility with pytest-parallel (regression in pytest 5.3.0).`
Original file line number	Diff line number	Diff line change
`@@ -1099,7 +1099,7 @@ def _get_main_color(stats) -> Tuple[str, List[str]]:`
`1099`	`1099`	`"failed passed skipped deselected xfailed xpassed warnings error".split()`
`1100`	`1100`	`)`
`1101`	`1101`	`unknown_type_seen = False`
`1102`		`- for found_type in stats:`
	`1102`	`+ for found_type in stats.keys():`
`1103`	`1103`	`if found_type not in known_types:`
`1104`	`1104`	`if found_type: # setup/teardown reports have an empty key, ignore them`
`1105`	`1105`	`known_types.append(found_type)`