summaryrefslogtreecommitdiffhomepage
path: root/pytest.ini
diff options
context:
space:
mode:
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/pytest.ini b/pytest.ini
index af021870..582242ca 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,7 +1,7 @@
[pytest]
# 10 seconds is more time than nearly any test ought to take and almost surely
-# indicates a full-on deadlock; but let's make it 30s just to be sure.
-timeout = 30
+# indicates a full-on deadlock.
+timeout = 10
# Sadly the signal method of pytest-timeout does not appear to help, at least
# for the SFTP hangs encountered developing issue #1100.
timeout_method = thread