summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-23 18:38:15 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-17 14:45:24 -0700
commit9c1365d16147d92c197979508c45340773ae162a (patch)
tree9f537e274c87e8033608563af24590343030349d
parent46c1d26cb4e0827f8c860b8333c5182d8f0e0caa (diff)
downloadparamiko-9c1365d16147d92c197979508c45340773ae162a.tar.gz
Nah
-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