Skip to content

Commit 29c8c69

Browse files
committed
Add compatibility function to assert outcomes
1 parent 2736d87 commit 29c8c69

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

requirements-testing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mock
1+
packaging

tests/utils.py

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
from __future__ import absolute_import, unicode_literals
2+
3+
import pytest
4+
from packaging.utils import Version
5+
6+
PYTEST_VERSION = Version(pytest.__version__)
7+
8+
_errors_key = "error" if PYTEST_VERSION < Version("6") else "errors"
9+
10+
if PYTEST_VERSION < Version("6"):
11+
12+
def assert_outcomes(
13+
result,
14+
passed=0,
15+
skipped=0,
16+
failed=0,
17+
errors=0,
18+
xpassed=0,
19+
xfailed=0,
20+
):
21+
"""Compatibility function for result.assert_outcomes"""
22+
return result.assert_outcomes(
23+
error=errors, # Pytest < 6 uses the singular form
24+
passed=passed,
25+
skipped=skipped,
26+
failed=failed,
27+
xpassed=xpassed,
28+
xfailed=xfailed,
29+
)
30+
31+
32+
else:
33+
34+
def assert_outcomes(
35+
result,
36+
passed=0,
37+
skipped=0,
38+
failed=0,
39+
errors=0,
40+
xpassed=0,
41+
xfailed=0,
42+
):
43+
"""Compatibility function for result.assert_outcomes"""
44+
return result.assert_outcomes(
45+
errors=errors, passed=passed, skipped=skipped, failed=failed, xpassed=xpassed, xfailed=xfailed
46+
)

0 commit comments

Comments
 (0)