diff options
| -rw-r--r-- | dev-requirements.txt | 1 | ||||
| -rw-r--r-- | pytest.ini | 7 |
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 |