Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add timeout flag to pytest #3363

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions devel/ansible/roles/bodhi/tasks/main.yml
Expand Up @@ -66,6 +66,12 @@
- zlib-devel
state: present

# Make pytest able to use --timeout
- name: pip install pytest-timeout
pip:
name: pytest-timeout
executable: pip3

- name: Initialize PostgreSQL
command: postgresql-setup initdb
args:
Expand Down
1 change: 1 addition & 0 deletions devel/ci/Dockerfile-f29
Expand Up @@ -33,6 +33,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
python3-pyramid-mako \
python3-pytest \
python3-pytest-cov \
python3-pytest-timeout \
python3-pyyaml \
python3-responses \
python3-simplemediawiki \
Expand Down
1 change: 1 addition & 0 deletions devel/ci/Dockerfile-f30
Expand Up @@ -39,6 +39,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
python3-pyramid-mako \
python3-pytest \
python3-pytest-cov \
python3-pytest-timeout \
python3-responses \
python3-simplemediawiki \
python3-sqlalchemy \
Expand Down
1 change: 1 addition & 0 deletions devel/ci/Dockerfile-f31
Expand Up @@ -37,6 +37,7 @@ RUN dnf install -y \
python3-pyramid-mako \
python3-pytest \
python3-pytest-cov \
python3-pytest-timeout \
python3-responses \
python3-simplemediawiki \
python3-sqlalchemy \
Expand Down
1 change: 1 addition & 0 deletions devel/ci/Dockerfile-pip
Expand Up @@ -35,6 +35,7 @@ RUN pip-3 install \
"pydocstyle<4.0" \
pytest \
pytest-cov \
pytest-timeout \
"sphinx<2.1" \
sqlalchemy_schemadisplay \
webtest
Expand Down
1 change: 1 addition & 0 deletions devel/ci/Dockerfile-rawhide
Expand Up @@ -37,6 +37,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
python3-pyramid-mako \
python3-pytest \
python3-pytest-cov \
python3-pytest-timeout \
python3-responses \
python3-simplemediawiki \
python3-sqlalchemy \
Expand Down
2 changes: 1 addition & 1 deletion devel/ci/cico.pipeline
Expand Up @@ -46,7 +46,7 @@ def configure_node = {
onmyduffynode 'yum install -y docker python36-click python36-pip python36-psycopg2 python36-requests rsync python36-cryptography python36-devel gcc'
onmyduffynode 'systemctl start docker'
// To run the integration testsuite
onmyduffynode 'python3.6 -m pip install \'pytest<4.0\' pytest-cov conu munch fedora-messaging'
onmyduffynode 'python3.6 -m pip install \'pytest<4.0\' pytest-cov conu munch fedora-messaging pytest-timeout'
}


Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -61,7 +61,7 @@ inherit = true
add-ignore = D413

[tool:pytest]
addopts = --cov-config .coveragerc --cov=bodhi --cov-report term --cov-report xml --cov-report html
addopts = --cov-config .coveragerc --cov=bodhi --cov-report term --cov-report xml --cov-report html --timeout=120

[update_catalog]
domain = bodhi
Expand Down