Skip to content

Commit

Permalink
Make the tests work with pytest 7.3.0 (#540)
Browse files Browse the repository at this point in the history
Co-authored-by: Adam Johnson <me@adamj.eu>
  • Loading branch information
hroncok and adamchainz committed Apr 12, 2023
1 parent 3edb981 commit d663e20
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 43 deletions.
10 changes: 3 additions & 7 deletions requirements/py310.txt
Expand Up @@ -4,10 +4,6 @@
#
# requirements/compile.py
#
attrs==22.2.0 \
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
# via pytest
coverage==7.2.3 \
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
Expand Down Expand Up @@ -121,9 +117,9 @@ pluggy==1.0.0 \
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
# via pytest
pytest==7.2.2 \
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
pytest==7.3.0 \
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
# via
# -r requirements.in
# pytest-xdist
Expand Down
10 changes: 3 additions & 7 deletions requirements/py311.txt
Expand Up @@ -4,10 +4,6 @@
#
# requirements/compile.py
#
attrs==22.2.0 \
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
# via pytest
coverage==7.2.3 \
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
Expand Down Expand Up @@ -117,9 +113,9 @@ pluggy==1.0.0 \
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
# via pytest
pytest==7.2.2 \
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
pytest==7.3.0 \
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
# via
# -r requirements.in
# pytest-xdist
Expand Down
10 changes: 3 additions & 7 deletions requirements/py37.txt
Expand Up @@ -4,10 +4,6 @@
#
# requirements/compile.py
#
attrs==22.2.0 \
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
# via pytest
coverage==7.2.3 \
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
Expand Down Expand Up @@ -131,9 +127,9 @@ pluggy==1.0.0 \
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
# via pytest
pytest==7.2.2 \
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
pytest==7.3.0 \
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
# via
# -r requirements.in
# pytest-xdist
Expand Down
10 changes: 3 additions & 7 deletions requirements/py38.txt
Expand Up @@ -4,10 +4,6 @@
#
# requirements/compile.py
#
attrs==22.2.0 \
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
# via pytest
coverage==7.2.3 \
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
Expand Down Expand Up @@ -125,9 +121,9 @@ pluggy==1.0.0 \
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
# via pytest
pytest==7.2.2 \
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
pytest==7.3.0 \
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
# via
# -r requirements.in
# pytest-xdist
Expand Down
10 changes: 3 additions & 7 deletions requirements/py39.txt
Expand Up @@ -4,10 +4,6 @@
#
# requirements/compile.py
#
attrs==22.2.0 \
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
# via pytest
coverage==7.2.3 \
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
Expand Down Expand Up @@ -125,9 +121,9 @@ pluggy==1.0.0 \
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
# via pytest
pytest==7.2.2 \
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
pytest==7.3.0 \
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
# via
# -r requirements.in
# pytest-xdist
Expand Down
16 changes: 8 additions & 8 deletions tests/test_pytest_randomly.py
Expand Up @@ -251,7 +251,7 @@ def test_it():
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_b.py::test_it PASSED",
"test_a.py::test_it PASSED",
"test_d.py::test_it PASSED",
Expand All @@ -271,7 +271,7 @@ def test_it():
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_b.py::test_it PASSED",
"test_a.py::test_it PASSED",
"test_d.py::test_it PASSED",
Expand Down Expand Up @@ -310,7 +310,7 @@ def test_d(self):
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_one.py::D::test_d PASSED",
"test_one.py::B::test_b PASSED",
"test_one.py::C::test_c PASSED",
Expand Down Expand Up @@ -342,7 +342,7 @@ def test_d(self):
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_one.py::T::test_c PASSED",
"test_one.py::T::test_b PASSED",
"test_one.py::T::test_a PASSED",
Expand Down Expand Up @@ -371,7 +371,7 @@ def test_d():
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_one.py::test_c PASSED",
"test_one.py::test_a PASSED",
"test_one.py::test_b PASSED",
Expand Down Expand Up @@ -405,7 +405,7 @@ def test_d():
out = ourtester.runpytest(*args)

out.assert_outcomes(passed=4, failed=0)
assert out.outlines[8:12] == [
assert out.outlines[9:13] == [
"test_one.py::test_c PASSED",
"test_one.py::test_a PASSED",
"test_one.py::test_b PASSED",
Expand Down Expand Up @@ -435,7 +435,7 @@ def bar():

out = ourtester.runpytest(*args)
out.assert_outcomes(passed=2)
assert out.outlines[8:10] == [
assert out.outlines[9:11] == [
"test_one.py::test_one.bar PASSED",
"test_one.py::test_one.foo PASSED",
]
Expand Down Expand Up @@ -515,7 +515,7 @@ def test_doctests_in_txt_files_reordered(ourtester):

out = ourtester.runpytest(*args)
out.assert_outcomes(passed=2)
assert out.outlines[8:10] == [
assert out.outlines[9:11] == [
"test2.txt::test2.txt PASSED",
"test.txt::test.txt PASSED",
]
Expand Down

0 comments on commit d663e20

Please sign in to comment.