summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini7
1 files changed, 0 insertions, 7 deletions
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 582242ca..00000000
--- a/pytest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[pytest]
-# 10 seconds is more time than nearly any test ought to take and almost surely
-# 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