From 6d9d14a4847a9ac769f6cab8b6af985b94378826 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 23 Oct 2017 18:35:00 -0700
Subject: Use pytest-timeout, configured via pytest.ini

---
 pytest.ini | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 pytest.ini

(limited to 'pytest.ini')

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..af021870
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +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
+# 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
-- 
cgit v1.2.1