p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6261 from blueyed/stats-keys 

terminal: _get_main_color: help pytest-parallel
This commit is contained in:
Daniel Hahler 2019-11-22 17:12:33 +01:00 committed by GitHub
parent a7268aaa5d 1f736a663d
commit 0601f5cdad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/6254.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix compatibility with pytest-parallel (regression in pytest 5.3.0).

2
src/_pytest/terminal.py
View File

@ -1099,7 +1099,7 @@ def _get_main_color(stats) -> Tuple[str, List[str]]:
"failed passed skipped deselected xfailed xpassed warnings error".split() "failed passed skipped deselected xfailed xpassed warnings error".split()
) )
unknown_type_seen = False 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 not in known_types:
if found_type: # setup/teardown reports have an empty key, ignore them if found_type: # setup/teardown reports have an empty key, ignore them
known_types.append(found_type) known_types.append(found_type)