Fix RunResult.parseoutcomes (follow-up to #6353)

This commit is contained in:
Daniel Hahler
2019-12-30 17:08:52 +01:00
parent 8077168387
commit 1c0242dec1
3 changed files with 17 additions and 10 deletions

View File

@@ -433,9 +433,14 @@ class RunResult:
for line in reversed(self.outlines):
if rex_session_duration.search(line):
outcomes = rex_outcome.findall(line)
return {noun: int(count) for (count, noun) in outcomes}
raise ValueError("Pytest terminal summary report not found")
ret = {noun: int(count) for (count, noun) in outcomes}
break
else:
raise ValueError("Pytest terminal summary report not found")
if "errors" in ret:
assert "error" not in ret
ret["error"] = ret.pop("errors")
return ret
def assert_outcomes(
self,
@@ -456,7 +461,7 @@ class RunResult:
"passed": d.get("passed", 0),
"skipped": d.get("skipped", 0),
"failed": d.get("failed", 0),
"error": d.get("error", 0) + d.get("errors", 0),
"error": d.get("error", 0),
"xpassed": d.get("xpassed", 0),
"xfailed": d.get("xfailed", 0),
}