summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-24 11:27:51 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-24 11:27:51 -0700
commitca1df7477d8178b2680f09c8e5d63cd94483535b (patch)
tree36b1c8fcc3468ff176da0aaa295fa4f483704630
parent77dc0e8e3c9dc1e3f22a09d52d930ee891983696 (diff)
downloadparamiko-ca1df7477d8178b2680f09c8e5d63cd94483535b.tar.gz
Realizing no, this is only really useful for debugging.
In normal testing it inflates test run time & also gets in the way of other pytest features. Mehh. Wish signal worked better.
-rw-r--r--dev-requirements.txt1
-rw-r--r--pytest.ini7
2 files changed, 0 insertions, 8 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 7302ff6b..9e09c03e 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -8,4 +8,3 @@ wheel==0.24
twine==1.9.1
flake8==2.6.2
pytest==3.2.1
-pytest-timeout==1.2.0
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