[buildstream] 01/02: setup.cfg: add timeout to prevent hanging tests

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

not-in-ldap pushed a commit to branch raoul/1023-ci-hanging
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 839c3e94f02bdca9d525de72fbcbe0abbee3c07b
Author: Raoul Hidalgo Charman <ra...@codethink.co.uk>
AuthorDate: Mon May 13 14:34:44 2019 +0100

    setup.cfg: add timeout to prevent hanging tests
    
    Part of #1023
---
 setup.cfg                            | 1 +
 tests/examples/flatpak-autotools.py  | 2 ++
 tests/integration/artifact.py        | 1 +
 tests/integration/shellbuildtrees.py | 1 +
 4 files changed, 5 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index efdca70..0078dc1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,7 @@ test=pytest
 addopts = --verbose --basetemp ./tmp --durations=20
 norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
 python_files = tests/*/*.py
+timeout = 60
 env =
     D:BST_TEST_SUITE=True
     D:XDG_CACHE_HOME=./tmp/cache
diff --git a/tests/examples/flatpak-autotools.py b/tests/examples/flatpak-autotools.py
index 8af564e..5a63770 100644
--- a/tests/examples/flatpak-autotools.py
+++ b/tests/examples/flatpak-autotools.py
@@ -39,6 +39,7 @@ def workaround_setuptools_bug(project):
                     reason='Examples are written for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
+@pytest.mark.timeout(300)
 def test_autotools_build(cli, datafiles):
     project = str(datafiles)
     checkout = os.path.join(cli.directory, 'checkout')
@@ -62,6 +63,7 @@ def test_autotools_build(cli, datafiles):
                     reason='Examples are written for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
+@pytest.mark.timeout(300)
 def test_autotools_run(cli, datafiles):
     project = str(datafiles)
     workaround_setuptools_bug(project)
diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py
index a5e1f4d..5fdbb9c 100644
--- a/tests/integration/artifact.py
+++ b/tests/integration/artifact.py
@@ -45,6 +45,7 @@ DATA_DIR = os.path.join(
 # content of an element on caching.
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.timeout(300)
 def test_cache_buildtrees(cli, tmpdir, datafiles):
     project = str(datafiles)
     element_name = 'autotools/amhello.bst'
diff --git a/tests/integration/shellbuildtrees.py b/tests/integration/shellbuildtrees.py
index 3d59c78..2d1501f 100644
--- a/tests/integration/shellbuildtrees.py
+++ b/tests/integration/shellbuildtrees.py
@@ -213,6 +213,7 @@ def test_buildtree_pulled(cli, tmpdir, datafiles):
 # This test checks for correct behaviour if a buildtree is not present in the local cache.
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.timeout(180)
 def test_buildtree_options(cli, tmpdir, datafiles):
     project = str(datafiles)
     element_name = 'build-shell/buildtree.bst'