Skip to content

Commit 8b12549

Browse files
committed
Add --timeout argument to all uses of pytest
1 parent 18971b5 commit 8b12549

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

.github/workflows/minimal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
run: |
2626
conda activate minimal
2727
python -m pip install .
28-
pytest -svx
28+
pytest -svx --timeout=300
2929
- name: Fixture generation
3030
shell: "bash -l {0}"
3131
run: |
3232
conda activate minimal
3333
rm -rf fixture/
34-
pytest -svx zarr/tests/test_dim_separator.py zarr/tests/test_storage.py
34+
pytest -svx --timeout=300 zarr/tests/test_dim_separator.py zarr/tests/test_storage.py
3535
# This simulates fixture-less tests in conda and debian packaging

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
conda activate zarr-env
7474
mkdir ~/blob_emulator
7575
azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log &
76-
pytest --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./
76+
pytest --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./ --timeout=300
7777
- uses: codecov/codecov-action@v1
7878
with:
7979
#token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ dependencies:
1010
- asciitree
1111
- fasteners
1212
- pytest
13+
- pytest-timeout
1314
- setuptools_scm

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ envlist = py37-npy{117,latest}, py38, py39, docs
1010
install_command = pip install --no-binary=numcodecs {opts} {packages}
1111
setenv =
1212
PYTHONHASHSEED = 42
13+
PYTEST_TIMEOUT = {env:PYTEST_TIMEOUT:300}
1314
passenv =
1415
ZARR_TEST_ABS
1516
ZARR_TEST_MONGO

0 commit comments

Comments
 (0)