use test timeouts

This commit is contained in:
Thomas Kriechbaumer 2016-02-01 23:10:40 +01:00
parent d8ae7c3e29
commit ab3543ba4d
3 changed files with 3 additions and 2 deletions

View File

@ -11,7 +11,7 @@ install:
- "pip install --user --src .. -r requirements.txt" - "pip install --user --src .. -r requirements.txt"
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
test_script: test_script:
- "py.test -s --cov libmproxy" - "py.test -s --cov libmproxy --timeout 30"
cache: cache:
- C:\Users\appveyor\AppData\Local\pip\cache - C:\Users\appveyor\AppData\Local\pip\cache
after_test: after_test:

View File

@ -61,7 +61,7 @@ before_script:
- "openssl version -a" - "openssl version -a"
script: script:
- "py.test -s --cov libmproxy" - "py.test -s --cov libmproxy --timeout 30"
after_success: after_success:
- coveralls - coveralls

View File

@ -46,6 +46,7 @@ dev_deps = {
"pytest>=2.8.0", "pytest>=2.8.0",
"pytest-xdist>=1.13.1", "pytest-xdist>=1.13.1",
"pytest-cov>=2.1.0", "pytest-cov>=2.1.0",
"pytest-timeout>=1.0.0",
"coveralls>=0.4.1", "coveralls>=0.4.1",
"pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), "pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
"sphinx>=1.3.1", "sphinx>=1.3.1",