Skip to content

Commit d663e20

Browse files
hroncokadamchainz
andauthored
Make the tests work with pytest 7.3.0 (#540)
Co-authored-by: Adam Johnson <me@adamj.eu>
1 parent 3edb981 commit d663e20

6 files changed

Lines changed: 23 additions & 43 deletions

File tree

requirements/py310.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#
55
# requirements/compile.py
66
#
7-
attrs==22.2.0 \
8-
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
9-
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
10-
# via pytest
117
coverage==7.2.3 \
128
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
139
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
@@ -121,9 +117,9 @@ pluggy==1.0.0 \
121117
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
122118
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
123119
# via pytest
124-
pytest==7.2.2 \
125-
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
126-
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
120+
pytest==7.3.0 \
121+
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
122+
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
127123
# via
128124
# -r requirements.in
129125
# pytest-xdist

requirements/py311.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#
55
# requirements/compile.py
66
#
7-
attrs==22.2.0 \
8-
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
9-
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
10-
# via pytest
117
coverage==7.2.3 \
128
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
139
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
@@ -117,9 +113,9 @@ pluggy==1.0.0 \
117113
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
118114
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
119115
# via pytest
120-
pytest==7.2.2 \
121-
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
122-
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
116+
pytest==7.3.0 \
117+
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
118+
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
123119
# via
124120
# -r requirements.in
125121
# pytest-xdist

requirements/py37.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#
55
# requirements/compile.py
66
#
7-
attrs==22.2.0 \
8-
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
9-
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
10-
# via pytest
117
coverage==7.2.3 \
128
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
139
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
@@ -131,9 +127,9 @@ pluggy==1.0.0 \
131127
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
132128
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
133129
# via pytest
134-
pytest==7.2.2 \
135-
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
136-
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
130+
pytest==7.3.0 \
131+
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
132+
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
137133
# via
138134
# -r requirements.in
139135
# pytest-xdist

requirements/py38.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#
55
# requirements/compile.py
66
#
7-
attrs==22.2.0 \
8-
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
9-
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
10-
# via pytest
117
coverage==7.2.3 \
128
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
139
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
@@ -125,9 +121,9 @@ pluggy==1.0.0 \
125121
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
126122
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
127123
# via pytest
128-
pytest==7.2.2 \
129-
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
130-
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
124+
pytest==7.3.0 \
125+
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
126+
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
131127
# via
132128
# -r requirements.in
133129
# pytest-xdist

requirements/py39.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#
55
# requirements/compile.py
66
#
7-
attrs==22.2.0 \
8-
--hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \
9-
--hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
10-
# via pytest
117
coverage==7.2.3 \
128
--hash=sha256:06ddd9c0249a0546997fdda5a30fbcb40f23926df0a874a60a8a185bc3a87d93 \
139
--hash=sha256:0743b0035d4b0e32bc1df5de70fba3059662ace5b9a2a86a9f894cfe66569013 \
@@ -125,9 +121,9 @@ pluggy==1.0.0 \
125121
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
126122
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
127123
# via pytest
128-
pytest==7.2.2 \
129-
--hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \
130-
--hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4
124+
pytest==7.3.0 \
125+
--hash=sha256:58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d \
126+
--hash=sha256:933051fa1bfbd38a21e73c3960cebdad4cf59483ddba7696c48509727e17f201
131127
# via
132128
# -r requirements.in
133129
# pytest-xdist

tests/test_pytest_randomly.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def test_it():
251251
out = ourtester.runpytest(*args)
252252

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

273273
out.assert_outcomes(passed=4, failed=0)
274-
assert out.outlines[8:12] == [
274+
assert out.outlines[9:13] == [
275275
"test_b.py::test_it PASSED",
276276
"test_a.py::test_it PASSED",
277277
"test_d.py::test_it PASSED",
@@ -310,7 +310,7 @@ def test_d(self):
310310
out = ourtester.runpytest(*args)
311311

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

344344
out.assert_outcomes(passed=4, failed=0)
345-
assert out.outlines[8:12] == [
345+
assert out.outlines[9:13] == [
346346
"test_one.py::T::test_c PASSED",
347347
"test_one.py::T::test_b PASSED",
348348
"test_one.py::T::test_a PASSED",
@@ -371,7 +371,7 @@ def test_d():
371371
out = ourtester.runpytest(*args)
372372

373373
out.assert_outcomes(passed=4, failed=0)
374-
assert out.outlines[8:12] == [
374+
assert out.outlines[9:13] == [
375375
"test_one.py::test_c PASSED",
376376
"test_one.py::test_a PASSED",
377377
"test_one.py::test_b PASSED",
@@ -405,7 +405,7 @@ def test_d():
405405
out = ourtester.runpytest(*args)
406406

407407
out.assert_outcomes(passed=4, failed=0)
408-
assert out.outlines[8:12] == [
408+
assert out.outlines[9:13] == [
409409
"test_one.py::test_c PASSED",
410410
"test_one.py::test_a PASSED",
411411
"test_one.py::test_b PASSED",
@@ -435,7 +435,7 @@ def bar():
435435

436436
out = ourtester.runpytest(*args)
437437
out.assert_outcomes(passed=2)
438-
assert out.outlines[8:10] == [
438+
assert out.outlines[9:11] == [
439439
"test_one.py::test_one.bar PASSED",
440440
"test_one.py::test_one.foo PASSED",
441441
]
@@ -515,7 +515,7 @@ def test_doctests_in_txt_files_reordered(ourtester):
515515

516516
out = ourtester.runpytest(*args)
517517
out.assert_outcomes(passed=2)
518-
assert out.outlines[8:10] == [
518+
assert out.outlines[9:11] == [
519519
"test2.txt::test2.txt PASSED",
520520
"test.txt::test.txt PASSED",
521521
]

0 commit comments

Comments
 (0)