diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py index c68169a9..358bb402 100644 --- a/tests/test_pytest_cov.py +++ b/tests/test_pytest_cov.py @@ -453,7 +453,7 @@ def test_no_cov(testdir): script) result.stdout.fnmatch_lines_random([ 'WARNING: Coverage disabled via --no-cov switch!', - '*1 warnings*' if pytest.__version__.startswith('2.7') else 'WCOV-U1*Coverage disabled via --no-cov switch!', + '*Coverage disabled via --no-cov switch!', ]) diff --git a/tox.ini b/tox.ini index 1d4602fc..490840b9 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,8 @@ [tox] envlist = check, - {py26,py27,py33,py34,py35,pypy}-{27,28,29,30}-{37,40,41,42,43}, - {py27,py33,py34,py35,py36,pypy}-{27,28,29,30}-{43,44}, + {py26,py27,py33,py34,py35,pypy}-{28,29,30,31}-{37,40,41,42,43}, + {py27,py33,py34,py35,py36,pypy}-{28,29,30,31}-{43,44}, docs [testenv] @@ -27,15 +27,15 @@ deps = 28: pytest==2.8.7 29: pytest==2.9.2 30: pytest==3.0.7 - pytest-capturelog + 31: pytest==3.1.3 37: coverage==3.7.1 40: coverage==4.0.3 41: coverage==4.1 42: coverage==4.2 43: coverage==4.3.4 - 44: coverage==4.4 + 44: coverage==4.4.1 virtualenv - pytest-xdist==1.15.0 + pytest-xdist==1.18.2 27: pytest-cache==1.0.0 process-tests==1.2.1 six