summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-24 11:27:51 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-17 14:45:49 -0700
commit1d96c4ebbc94a919df147b513009f6eb3a5df712 (patch)
treea7e6a7d7fd08c1d57ae905dc11f5c897991232b7
parentb4bd03f601305f825282a727c5f5d9c0b36dd94f (diff)
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 cff31e73..cc11c0fc 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -8,4 +8,3 @@ wheel==0.24
twine>=1.11.0
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