Add timeout flag to pytest

fix #3339 Signed-off-by: Sebastian Wojciechowski <s.wojciechowski89@gmail.com>
fedora-infra · Nov 5, 2019 · 5c1d641 · 5c1d641
1 parent 2723771
commit 5c1d641
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 2 deletions.
diff --git a/devel/ansible/roles/bodhi/tasks/main.yml b/devel/ansible/roles/bodhi/tasks/main.yml
@@ -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:

diff --git a/devel/ci/Dockerfile-f29 b/devel/ci/Dockerfile-f29
@@ -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 \

diff --git a/devel/ci/Dockerfile-f30 b/devel/ci/Dockerfile-f30
@@ -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 \

diff --git a/devel/ci/Dockerfile-f31 b/devel/ci/Dockerfile-f31
@@ -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 \

diff --git a/devel/ci/Dockerfile-pip b/devel/ci/Dockerfile-pip
@@ -35,6 +35,7 @@ RUN pip-3 install \
     "pydocstyle<4.0" \
     pytest \
     pytest-cov \
+    pytest-timeout \
     "sphinx<2.1" \
     sqlalchemy_schemadisplay \
     webtest

diff --git a/devel/ci/Dockerfile-rawhide b/devel/ci/Dockerfile-rawhide
@@ -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 \

diff --git a/devel/ci/cico.pipeline b/devel/ci/cico.pipeline
@@ -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'
 }
 
 

diff --git a/setup.cfg b/setup.cfg
@@ -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=60
 
 [update_catalog]
 domain = bodhi