Skip to content

Commit a9394d5

Browse files
authored
Merge pull request #9740 from pradyunsg/tests/drop-pytest-timeout
Drop pytest-timeout
2 parents 7ec0fa5 + 724bf3d commit a9394d5

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

tests/functional/test_install.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ def test_pep518_with_namespace_package(script, data, common_wheels):
163163
)
164164

165165

166-
@pytest.mark.timeout(60)
167166
@pytest.mark.parametrize('command', ('install', 'wheel'))
168167
@pytest.mark.parametrize('package', ('pep518_forkbomb',
169168
'pep518_twin_forkbombs_first',

tools/requirements/tests.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ pretend
55
pytest
66
pytest-cov
77
pytest-rerunfailures
8-
pytest-timeout
98
pytest-xdist
109
pyyaml
1110
scripttest

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ deps = -r{toxinidir}/tools/requirements/tests.txt
2727
commands_pre =
2828
python -c 'import shutil, sys; shutil.rmtree(sys.argv[1], ignore_errors=True)' {toxinidir}/tests/data/common_wheels
2929
{[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tools/requirements/tests-common_wheels.txt
30-
commands = pytest --timeout 300 []
30+
commands = pytest []
3131
install_command = {[helpers]pip} install {opts} {packages}
3232
list_dependencies_command = {[helpers]pip} freeze --all
3333

3434
[testenv:coverage]
3535
basepython = python3
3636
commands =
3737
{[helpers]mkdirp} {toxinidir}/.coverage-output
38-
pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg []
38+
pytest --cov=pip --cov-config={toxinidir}/setup.cfg []
3939

4040
setenv =
4141
# Used in coverage configuration in setup.cfg.

0 commit comments

Comments
 (0)