From c2dfa778a85c1f64f3f59007b8d8ca98c877cac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Thu, 4 Mar 2021 14:09:21 +0200 Subject: [PATCH] Update test deps. Remove unnecessary assertion. Closes #452. --- .appveyor.yml | 10 ++++---- .travis.yml | 50 +++++++++++++++------------------------- tests/test_pytest_cov.py | 11 --------- tox.ini | 10 ++++---- 4 files changed, 30 insertions(+), 51 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8c776417..fde3a6aa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,11 +4,11 @@ build: off environment: matrix: - TOXENV: check - - TOXENV: 'py27-pytest46-xdist127-coverage52,py27-pytest46-xdist127-coverage53' - - TOXENV: 'py35-pytest46-xdist127-coverage52,py35-pytest46-xdist127-coverage53' - - TOXENV: 'py36-pytest46-xdist127-coverage52,py36-pytest46-xdist127-coverage53,py36-pytest46-xdist133-coverage53,py36-pytest54-xdist133-coverage53,py36-pytest62-xdist202-coverage53' - - TOXENV: 'py37-pytest46-xdist127-coverage52,py37-pytest46-xdist127-coverage53,py37-pytest46-xdist133-coverage53,py37-pytest54-xdist133-coverage53,py37-pytest62-xdist202-coverage53' - - TOXENV: 'pypy-pytest46-xdist127-coverage52,pypy-pytest46-xdist127-coverage53' + - TOXENV: 'py27-pytest46-xdist127-coverage55' + - TOXENV: 'py35-pytest46-xdist127-coverage55' + - TOXENV: 'py36-pytest46-xdist127-coverage55,py36-pytest46-xdist133-coverage55,py36-pytest54-xdist133-coverage55,py36-pytest62-xdist202-coverage55' + - TOXENV: 'py37-pytest46-xdist127-coverage55,py37-pytest46-xdist133-coverage55,py37-pytest54-xdist133-coverage55,py37-pytest62-xdist202-coverage55' + - TOXENV: 'pypy-pytest46-xdist127-coverage55' init: - ps: echo $env:TOXENV diff --git a/.travis.yml b/.travis.yml index db6e815a..a9cafa4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,55 +20,43 @@ jobs: - env: TOXENV=docs - stage: tests - env: TOXENV=py27-pytest46-xdist127-coverage52 + env: TOXENV=py27-pytest46-xdist127-coverage55 python: '2.7' - - env: TOXENV=py27-pytest46-xdist127-coverage53 - python: '2.7' - - env: TOXENV=py35-pytest46-xdist127-coverage52 - python: '3.5' - - env: TOXENV=py35-pytest46-xdist127-coverage53 + - env: TOXENV=py35-pytest46-xdist127-coverage55 python: '3.5' - - env: TOXENV=py36-pytest46-xdist127-coverage52 - python: '3.6' - - env: TOXENV=py36-pytest46-xdist127-coverage53 + - env: TOXENV=py36-pytest46-xdist127-coverage55 python: '3.6' - - env: TOXENV=py37-pytest46-xdist127-coverage52 + - env: TOXENV=py37-pytest46-xdist127-coverage55 python: '3.7' - - env: TOXENV=py37-pytest46-xdist127-coverage53 - python: '3.7' - - env: TOXENV=pypy-pytest46-xdist127-coverage52 - python: 'pypy' - - env: TOXENV=pypy-pytest46-xdist127-coverage53 + - env: TOXENV=pypy-pytest46-xdist127-coverage55 python: 'pypy' - - env: TOXENV=pypy3-pytest46-xdist127-coverage52 - python: 'pypy3' - - env: TOXENV=pypy3-pytest46-xdist127-coverage53 + - env: TOXENV=pypy3-pytest46-xdist127-coverage55 python: 'pypy3' - - env: TOXENV=py36-pytest46-xdist133-coverage53 + - env: TOXENV=py36-pytest46-xdist133-coverage55 python: '3.6' - - env: TOXENV=py36-pytest54-xdist133-coverage53 + - env: TOXENV=py36-pytest54-xdist133-coverage55 python: '3.6' - - env: TOXENV=py37-pytest46-xdist133-coverage53 + - env: TOXENV=py37-pytest46-xdist133-coverage55 python: '3.7' - - env: TOXENV=py37-pytest54-xdist133-coverage53 + - env: TOXENV=py37-pytest54-xdist133-coverage55 python: '3.7' - - env: TOXENV=py38-pytest46-xdist133-coverage53 + - env: TOXENV=py38-pytest46-xdist133-coverage55 python: '3.8' - - env: TOXENV=py38-pytest54-xdist133-coverage53 + - env: TOXENV=py38-pytest54-xdist133-coverage55 python: '3.8' - - env: TOXENV=pypy3-pytest46-xdist133-coverage53 + - env: TOXENV=pypy3-pytest46-xdist133-coverage55 python: 'pypy3' - - env: TOXENV=pypy3-pytest54-xdist133-coverage53 + - env: TOXENV=pypy3-pytest54-xdist133-coverage55 python: 'pypy3' - - env: TOXENV=py36-pytest62-xdist202-coverage53 + - env: TOXENV=py36-pytest62-xdist202-coverage55 python: '3.6' - - env: TOXENV=py37-pytest62-xdist202-coverage53 + - env: TOXENV=py37-pytest62-xdist202-coverage55 python: '3.7' - - env: TOXENV=py38-pytest62-xdist202-coverage53 + - env: TOXENV=py38-pytest62-xdist202-coverage55 python: '3.8' - - env: TOXENV=py39-pytest62-xdist202-coverage53 + - env: TOXENV=py39-pytest62-xdist202-coverage55 python: '3.9' - - env: TOXENV=pypy3-pytest62-xdist202-coverage53 + - env: TOXENV=pypy3-pytest62-xdist202-coverage55 python: 'pypy3' - stage: examples diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py index 3c730504..0d1b5a23 100644 --- a/tests/test_pytest_cov.py +++ b/tests/test_pytest_cov.py @@ -498,10 +498,6 @@ def test_central_coveragerc(testdir, prop): 'test_central_coveragerc* %s *' % prop.result, '*10 passed*', ]) - - # single-module coverage report - assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:]) - assert result.ret == 0 @@ -536,10 +532,6 @@ def test_central_with_path_aliasing(testdir, monkeypatch, opts, prop): 'src[\\/]mod* %s *' % prop.result, '*10 passed*', ]) - - # single-module coverage report - assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:]) - assert result.ret == 0 @@ -642,9 +634,6 @@ def test_show_missing_coveragerc(testdir, prop): '*10 passed*', ]) - # single-module coverage report - assert all(not line.startswith('TOTAL ') for line in result.stdout.lines[-4:]) - assert result.ret == 0 diff --git a/tox.ini b/tox.ini index 279db82e..6be986e9 100644 --- a/tox.ini +++ b/tox.ini @@ -13,9 +13,9 @@ passenv = [tox] envlist = check - py{27,35,36,37,py,py3}-pytest46-xdist127-coverage{52,53} - py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{53} - py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{53} + py{27,35,36,37,py,py3}-pytest46-xdist127-coverage{55} + py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{55} + py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{55} docs [testenv] @@ -29,7 +29,7 @@ setenv = pytest54: _DEP_PYTEST=pytest==5.4.3 pytest60: _DEP_PYTEST=pytest==6.0.2 pytest61: _DEP_PYTEST=pytest==6.1.2 - pytest62: _DEP_PYTEST=pytest==6.2.1 + pytest62: _DEP_PYTEST=pytest==6.2.2 xdist127: _DEP_PYTESTXDIST=pytest-xdist==1.27.0 xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0 @@ -47,6 +47,8 @@ setenv = coverage51: _DEP_COVERAGE=coverage==5.1 coverage52: _DEP_COVERAGE=coverage==5.2.1 coverage53: _DEP_COVERAGE=coverage==5.3.1 + coverage54: _DEP_COVERAGE=coverage==5.4 + coverage55: _DEP_COVERAGE=coverage==5.5 # For testing against a coverage.py working tree. coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME} passenv =