Merge branch 'juerg/test-timeouts' into 'master'

Increase test timeouts

See merge request BuildStream/buildstream!1884

3 files changed, 4 insertions, 4 deletions

diff --git a/setup.cfg b/setup.cfg
index 8b3d60388..7d3599e14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,7 @@ tag_regex = *.*.*
 parentdir_prefix = BuildStream-
 
 [tool:pytest]
-addopts = --verbose --basetemp ./tmp --durations=20 --timeout=900
+addopts = --verbose --basetemp ./tmp --durations=20 --timeout=1800
 norecursedirs = src tests/integration/project integration-cache tmp __pycache__ .eggs
 python_files = tests/*/*.py
 env =
diff --git a/tests/format/variables.py b/tests/format/variables.py
index 11a34ee07..ecc1e2b12 100644
--- a/tests/format/variables.py
+++ b/tests/format/variables.py
@@ -61,7 +61,7 @@ def test_missing_variable(cli, datafiles, element):
     result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.UNRESOLVED_VARIABLE)
 
 
-@pytest.mark.timeout(3, method="signal")
+@pytest.mark.timeout(15, method="signal")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, "cyclic_variables"))
 def test_cyclic_variables(cli, datafiles):
     print_warning("Performing cyclic test, if this test times out it will " + "exit the test sequence")
diff --git a/tests/testutils/constants.py b/tests/testutils/constants.py
index e14624143..e95d4428e 100644
--- a/tests/testutils/constants.py
+++ b/tests/testutils/constants.py
@@ -5,11 +5,11 @@
 #
 # Use this for operations that are expected to finish within a short amount of
 # time. Like `bst init`, `bst show` on a small project.
-PEXPECT_TIMEOUT_SHORT = 5
+PEXPECT_TIMEOUT_SHORT = 30
 
 
 # Timeout for longer interactive operations (in seconds).
 #
 # Use this for operations that are expected to take longer amounts of time,
 # like `bst build` on a small project.
-PEXPECT_TIMEOUT_LONG = 60
+PEXPECT_TIMEOUT_LONG = 300