Skip to content

Commit 604f593

Browse files
committed
mark resultslog test as skipif instead
1 parent 597b0b5 commit 604f593

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

test_pytest_rerunfailures.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
import time
33
from unittest import mock
44

5+
import pkg_resources
56
import pytest
67

78

89
pytest_plugins = "pytester"
910

11+
PYTEST_GTE_61 = pkg_resources.parse_version(
12+
pytest.__version__
13+
) >= pkg_resources.parse_version("6.1")
14+
1015

1116
def temporary_failure(count=1):
1217
return """
@@ -278,23 +283,17 @@ def test_pass():
278283
assert_outcomes(result, passed=0, error=1, rerun=1)
279284

280285

286+
@pytest.mark.skipif(PYTEST_GTE_61, reason="--result-log removed in pytest>=6.1")
281287
def test_rerun_with_resultslog(testdir):
282-
import pkg_resources
283-
284-
PYTEST_LT_61 = pkg_resources.parse_version(
285-
pytest.__version__
286-
) < pkg_resources.parse_version("6.1")
287-
288288
testdir.makepyfile(
289289
"""
290290
def test_fail():
291291
assert False"""
292292
)
293293

294-
if PYTEST_LT_61:
295-
result = testdir.runpytest("--reruns", "2", "--result-log", "./pytest.log")
294+
result = testdir.runpytest("--reruns", "2", "--result-log", "./pytest.log")
296295

297-
assert_outcomes(result, passed=0, failed=1, rerun=2)
296+
assert_outcomes(result, passed=0, failed=1, rerun=2)
298297

299298

300299
@pytest.mark.parametrize("delay_time", [-1, 0, 0.0, 1, 2.5])

0 commit comments

Comments
 (0)