mirror of https://github.com/pypa/pip
Drop pytest-timeout
It is incompatible with pytest-xdist and causes crashes when used with it. Also removes the marker from the only test that uses it.
This commit is contained in:
parent
bcbfbaa515
commit
724bf3df0c
|
@ -163,7 +163,6 @@ def test_pep518_with_namespace_package(script, data, common_wheels):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.timeout(60)
|
|
||||||
@pytest.mark.parametrize('command', ('install', 'wheel'))
|
@pytest.mark.parametrize('command', ('install', 'wheel'))
|
||||||
@pytest.mark.parametrize('package', ('pep518_forkbomb',
|
@pytest.mark.parametrize('package', ('pep518_forkbomb',
|
||||||
'pep518_twin_forkbombs_first',
|
'pep518_twin_forkbombs_first',
|
||||||
|
|
|
@ -5,7 +5,6 @@ pretend
|
||||||
pytest
|
pytest
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-rerunfailures
|
pytest-rerunfailures
|
||||||
pytest-timeout
|
|
||||||
pytest-xdist
|
pytest-xdist
|
||||||
pyyaml
|
pyyaml
|
||||||
scripttest
|
scripttest
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -27,7 +27,7 @@ deps = -r{toxinidir}/tools/requirements/tests.txt
|
||||||
commands_pre =
|
commands_pre =
|
||||||
python -c 'import shutil, sys; shutil.rmtree(sys.argv[1], ignore_errors=True)' {toxinidir}/tests/data/common_wheels
|
python -c 'import shutil, sys; shutil.rmtree(sys.argv[1], ignore_errors=True)' {toxinidir}/tests/data/common_wheels
|
||||||
{[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tools/requirements/tests-common_wheels.txt
|
{[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tools/requirements/tests-common_wheels.txt
|
||||||
commands = pytest --timeout 300 []
|
commands = pytest []
|
||||||
install_command = {[helpers]pip} install {opts} {packages}
|
install_command = {[helpers]pip} install {opts} {packages}
|
||||||
list_dependencies_command = {[helpers]pip} freeze --all
|
list_dependencies_command = {[helpers]pip} freeze --all
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ list_dependencies_command = {[helpers]pip} freeze --all
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
{[helpers]mkdirp} {toxinidir}/.coverage-output
|
{[helpers]mkdirp} {toxinidir}/.coverage-output
|
||||||
pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg []
|
pytest --cov=pip --cov-config={toxinidir}/setup.cfg []
|
||||||
|
|
||||||
setenv =
|
setenv =
|
||||||
# Used in coverage configuration in setup.cfg.
|
# Used in coverage configuration in setup.cfg.
|
||||||
|
|
Loading…
Reference in New Issue