summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-12-19 11:13:20 +0000
committerJürg Billeter <j@bitron.ch>2019-12-19 11:13:20 +0000
commit8ec01832ddfa9ce3ac56f3895936d9927f4b4342 (patch)
tree81d3ae29c7714e4e4d9413d9ecdc42106193f547
parentd1d898bdc60dc35ff618039775d53bb96774b836 (diff)
parent2d63e536faf164a45d565186028ce2d0b291f431 (diff)
downloadbuildstream-8ec01832ddfa9ce3ac56f3895936d9927f4b4342.tar.gz
Merge branch 'juerg/pytest-timeout' into 'master'
setup.cfg: Set pytest default timeout See merge request BuildStream/buildstream!1775
-rw-r--r--setup.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index 363758652..76670ea3e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ parentdir_prefix = BuildStream-
test=pytest
[tool:pytest]
-addopts = --verbose --basetemp ./tmp --durations=20
+addopts = --verbose --basetemp ./tmp --durations=20 --timeout=900
norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
env =