summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2021-03-07 08:17:34 -0800
committerGitHub <noreply@github.com>2021-03-07 08:17:34 -0800
commit79b03ce8db027dccea4dc106f222b3bcf5b91e93 (patch)
treee1cc6f57107e096a9dc708df3c59db1996a109ef
parentfc651fb158d1826b0ffbd1891877278b5e8afd1b (diff)
parent412fc001a0770d44b281d9b39f736df3cdc80c37 (diff)
downloadpytest-upstream-master.tar.gz
Merge pull request #8411 from RonnyPfannschmidt/example-outcomes-checkupstream-master
fix bug in test for issue 519
-rw-r--r--changelog/8411.trivial.rst1
-rw-r--r--testing/example_scripts/issue_519.py4
-rw-r--r--testing/examples/test_issue519.py5
3 files changed, 6 insertions, 4 deletions
diff --git a/changelog/8411.trivial.rst b/changelog/8411.trivial.rst
new file mode 100644
index 000000000..8f169a900
--- /dev/null
+++ b/changelog/8411.trivial.rst
@@ -0,0 +1 @@
+Assert the outcomes for the issue 518 test and fix the test.
diff --git a/testing/example_scripts/issue_519.py b/testing/example_scripts/issue_519.py
index 392829488..e44367fca 100644
--- a/testing/example_scripts/issue_519.py
+++ b/testing/example_scripts/issue_519.py
@@ -20,12 +20,12 @@ def checked_order():
yield order
pprint.pprint(order)
assert order == [
- ("testing/example_scripts/issue_519.py", "fix1", "arg1v1"),
+ ("issue_519.py", "fix1", "arg1v1"),
("test_one[arg1v1-arg2v1]", "fix2", "arg2v1"),
("test_two[arg1v1-arg2v1]", "fix2", "arg2v1"),
("test_one[arg1v1-arg2v2]", "fix2", "arg2v2"),
("test_two[arg1v1-arg2v2]", "fix2", "arg2v2"),
- ("testing/example_scripts/issue_519.py", "fix1", "arg1v2"),
+ ("issue_519.py", "fix1", "arg1v2"),
("test_one[arg1v2-arg2v1]", "fix2", "arg2v1"),
("test_two[arg1v2-arg2v1]", "fix2", "arg2v1"),
("test_one[arg1v2-arg2v2]", "fix2", "arg2v2"),
diff --git a/testing/examples/test_issue519.py b/testing/examples/test_issue519.py
index 85ba545e6..7b9c10988 100644
--- a/testing/examples/test_issue519.py
+++ b/testing/examples/test_issue519.py
@@ -1,6 +1,7 @@
from _pytest.pytester import Pytester
-def test_510(pytester: Pytester) -> None:
+def test_519(pytester: Pytester) -> None:
pytester.copy_example("issue_519.py")
- pytester.runpytest("issue_519.py")
+ res = pytester.runpytest("issue_519.py")
+ res.assert_outcomes(passed=8)